Index: openacs-4/packages/lars-blogger/tcl/lars-blogger-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/tcl/lars-blogger-procs.tcl,v
diff -u -r1.24 -r1.25
--- openacs-4/packages/lars-blogger/tcl/lars-blogger-procs.tcl	13 Jun 2005 16:36:12 -0000	1.24
+++ openacs-4/packages/lars-blogger/tcl/lars-blogger-procs.tcl	15 Jun 2005 18:41:49 -0000	1.25
@@ -7,47 +7,6 @@
 
 namespace eval lars_blogger {}
 
-namespace eval lars_blogger::merge {
-
-    ad_proc -callback MergeShowUserInfo -impl lars_blogger {
-	-user_id:required
-    } {
-	Show the items of user_id
-    } {
-	set msg "Lars_blogger items of $user_id"
-	set result [list $msg]
-
-	set channels [db_list_of_lists sel_channels { *SQL* }]
-	lappend result $channels
-	
-	return $result
-    }
-
-    ad_proc -callback MergePackageUser -impl lars_blogger {
-	-from_user_id:required
-	-to_user_id:required
-    } {
-	Merge the entries of two users.
-
-	The from_user_id is the user_id of the user
-	that will be deleted and all the entries
-	of this user will be mapped to the to_user_id.
-	
-    } {
-	set msg "Merging lars_blogger"
-	ns_log Notice $msg
-	set result [list $msg]
-
-	db_dml upd_channels { *SQL* }
-	
-	lappend result "Merge of lars_blogger is done"
-	
-	return $result
-    }
-}
-
-
-
 ad_proc lars_blog_setup_feed {
     -user:boolean
     {-package_id ""}
Index: openacs-4/packages/lars-blogger/tcl/lars-blogger-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/tcl/lars-blogger-procs.xql,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/lars-blogger/tcl/lars-blogger-procs.xql	13 Jun 2005 16:36:12 -0000	1.9
+++ openacs-4/packages/lars-blogger/tcl/lars-blogger-procs.xql	15 Jun 2005 18:41:49 -0000	1.10
@@ -87,20 +87,4 @@
         </querytext>
     </fullquery>
 
-    <fullquery name="callback::MergePackageUser::impl::lars_blogger.upd_channels">
-        <querytext>	
-        update weblogger_channels
-	set user_id = :to_user_id
-	where user_id = :from_user_id
-        </querytext>
-    </fullquery>	
-
-    <fullquery name="callback::MergeShowUserInfo::impl::lars_blogger.sel_channels">
-        <querytext>	
-        select channel_id, package_id
-        from weblogger_channels
-        where user_id = :user_id
-        </querytext>
-    </fullquery>	
-
 </queryset>