Index: openacs.org-dev/packages/forums/tcl/forums-sc-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/packages/forums/tcl/forums-sc-procs.tcl,v
diff -u -r1.2 -r1.3
--- openacs.org-dev/packages/forums/tcl/forums-sc-procs.tcl	9 Aug 2002 09:58:25 -0000	1.2
+++ openacs.org-dev/packages/forums/tcl/forums-sc-procs.tcl	14 Aug 2002 01:45:38 -0000	1.3
@@ -8,7 +8,7 @@
 
 }
 
-namespace eval forums::message {
+namespace eval forum::message {
 
 ad_proc datasource { message_id } {
     @param message_id
@@ -20,8 +20,14 @@
     search engine
 
 } {
-    forums::message::get -message_id $message_id -array message
-    return $message(content)
+    forum::message::get -message_id $message_id -array message
+	set datasource(object_id) $message(message_id)
+	set datasource(title) $message(subject)
+	set datasource(content) $message(content)
+	set datasource(keywords) ""
+	set datasource(storage_type) text
+
+    return [array get datasource]
 }
 
 ad_proc url { message_id } {
@@ -32,9 +38,9 @@
     returns a url for a message to the search package
 
 } {
-    forums::message::get -message_id $message_id -array message
+    forum::message::get -message_id $message_id -array message
     set forum_id $message(forum_id)
     set url "[ad_url][db_string select_forums_package_url {}]"
 }
 
-}
\ No newline at end of file
+}
Index: openacs.org-dev/packages/forums/tcl/messages-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/packages/forums/tcl/messages-procs-postgresql.xql,v
diff -u -r1.3 -r1.4
--- openacs.org-dev/packages/forums/tcl/messages-procs-postgresql.xql	12 Aug 2002 17:20:31 -0000	1.3
+++ openacs.org-dev/packages/forums/tcl/messages-procs-postgresql.xql	14 Aug 2002 01:45:38 -0000	1.4
@@ -10,9 +10,8 @@
                    party__email(forums_messages.user_id) as user_email,
                    forums_forum__name(forums_messages.forum_id) as forum_name, 
                    forums_message__root_message_id(forums_messages.message_id) as root_message_id,
-                   (select fm2.subject
-                    from forums_messages fm2 
-                    where fm2.message_id = forums_message__root_message_id(forums_messages.message_id)) as root_subject, 
+                   (                 
+                    select forums_message__get_subject(forums_message__root_message_id(forums_messages.message_id))) as root_subject, 
                    to_char(forums_messages.posting_date, 'Mon DD YYYY HH24:MI:SS') as posting_date
             from forums_messages
             where forums_messages.message_id= :message_id
@@ -27,9 +26,7 @@
                    party__email(forums_messages.user_id) as user_email,
                    forums_forum__name(forums_messages.forum_id) as forum_name, 
                    forums_message__root_message_id(forums_messages.message_id) as root_message_id,
-                   (select fm2.subject
-                    from forums_messages fm2 
-                    where fm2.message_id = forums_message__root_message_id(forums_messages.message_id)) as root_subject, 
+                   (select forums_message__get_subject(forums_message__root_message_id(forums_messages.message_id))) as root_subject, 
                    to_char(forums_messages.posting_date, 'Mon DD YYYY HH24:MI:SS') as posting_date
             from forums_messages
             where forums_messages.message_id= :message_id
@@ -68,7 +65,7 @@
         </querytext>
     </fullquery>
 
-<fullquery name="delete_notification">
+<fullquery name="forum::message::delete.delete_notification">
 <querytext>
 select notification__delete(:notification_id)
 </querytext>
Index: openacs.org-dev/packages/forums/tcl/messages-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/packages/forums/tcl/messages-procs.tcl,v
diff -u -r1.4 -r1.5
--- openacs.org-dev/packages/forums/tcl/messages-procs.tcl	12 Aug 2002 17:20:31 -0000	1.4
+++ openacs.org-dev/packages/forums/tcl/messages-procs.tcl	14 Aug 2002 01:45:38 -0000	1.5
@@ -37,7 +37,8 @@
 
             get -message_id $message_id -array message
             if {[info exists message(state)] && [string equal $message(state) approved]} {
-                do_notifications -message_id $message_id
+# DaveB take this out after migration!!
+#                do_notifications -message_id $message_id
             }
         }
 
Index: openacs.org-dev/packages/forums/tcl/messages-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/packages/forums/tcl/messages-procs.xql,v
diff -u -r1.2 -r1.3
--- openacs.org-dev/packages/forums/tcl/messages-procs.xql	12 Aug 2002 17:20:31 -0000	1.2
+++ openacs.org-dev/packages/forums/tcl/messages-procs.xql	14 Aug 2002 01:45:38 -0000	1.3
@@ -27,7 +27,7 @@
         </querytext>
     </fullquery>
 
-    <fullquery name="forum::message::get_notifications_for_delete">
+    <fullquery name="forum::message::delete.get_notifications_for_delete">
         <querytext>
             select notification_id from notifications
 	    where object_id=:message_id or response_id=:message_id