Index: openacs-4/packages/forums/tcl/forums-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/tcl/forums-procs.tcl,v
diff -u -r1.19 -r1.20
--- openacs-4/packages/forums/tcl/forums-procs.tcl	13 Jun 2005 16:38:34 -0000	1.19
+++ openacs-4/packages/forums/tcl/forums-procs.tcl	15 Jun 2005 17:43:42 -0000	1.20
@@ -10,56 +10,6 @@
 
 namespace eval forum {}
 
-namespace eval forum::merge {
-    ad_proc -callback MergeShowUserInfo -impl forums {
-	-user_id:required
-    } {
-	Merge the *forums* of two users.
-	The from_user_id is the user_id of the user
-	that will be deleted and all the *forums*
-	of this user will be mapped to the to_user_id.
-	
-    } {
-	set msg "Forums items of $user_id"
-	ns_log Notice $msg
-	set result [list $msg]
-	
-  	set last_poster [db_list_of_lists sel_poster {*SQL*} ]
-	set msg "Last Poster of $last_poster"
-	lappend result $msg
-
-  	set poster [db_list_of_lists sel_user_id {*SQL*} ]
-	set msg "Poster of $poster"
-	lappend result $msg
-
-	return $result
-    }
-
-    ad_proc -callback MergePackageUser -impl forums {
-	-from_user_id:required
-	-to_user_id:required
-    } {
-	Merge the *forums* of two users.
-	The from_user_id is the user_id of the user
-	that will be deleted and all the *forums*
-	of this user will be mapped to the to_user_id.
-	
-    } {
-	set msg "Merging forums" 
-	ns_log Notice $msg
-	set result [list $msg]
-       
-	db_dml upd_poster { *SQL* }
-	db_dml upd_user_id { *SQL* }
-
-	lappend result "Merge of forums is done"
-
-	return $result
-    }
-}
-
-
-
 ad_proc -public forum::new {
     {-forum_id ""}
     {-name:required}
Index: openacs-4/packages/forums/tcl/forums-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/tcl/forums-procs.xql,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/forums/tcl/forums-procs.xql	13 Jun 2005 16:38:34 -0000	1.6
+++ openacs-4/packages/forums/tcl/forums-procs.xql	15 Jun 2005 17:43:42 -0000	1.7
@@ -56,36 +56,4 @@
         </querytext>
     </fullquery>
 
-    <fullquery name="callback::MergePackageUser::impl::forums.upd_poster">
-        <querytext>	
-	update forums_messages
-	set last_poster = :to_user_id
-	where last_poster = :from_user_id
-        </querytext>
-    </fullquery>
-
-    <fullquery name="callback::MergePackageUser::impl::forums.upd_user_id">
-        <querytext>	
-        update forums_messages
-	set user_id = :to_user_id
-	where user_id = :from_user_id
-        </querytext>
-    </fullquery>
-
-    <fullquery name="callback::MergeShowUserInfo::impl::forums.sel_user_id">
-        <querytext>	
-        select message_id, subject
-	from forums_messages
-	where user_id = :user_id
-        </querytext>
-    </fullquery>
-
-    <fullquery name="callback::MergeShowUserInfo::impl::forums.sel_poster">
-        <querytext>	
-        select message_id, subject
-	from forums_messages
-	where last_poster = :user_id
-        </querytext>
-    </fullquery>
- 
 </queryset>