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.23 -r1.23.2.1
--- openacs-4/packages/lars-blogger/tcl/lars-blogger-procs.tcl	26 Feb 2005 17:52:21 -0000	1.23
+++ openacs-4/packages/lars-blogger/tcl/lars-blogger-procs.tcl	15 Jun 2005 18:40:28 -0000	1.23.2.1
@@ -7,6 +7,46 @@
 
 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.8 -r1.8.2.1
--- openacs-4/packages/lars-blogger/tcl/lars-blogger-procs.xql	17 May 2004 15:15:19 -0000	1.8
+++ openacs-4/packages/lars-blogger/tcl/lars-blogger-procs.xql	15 Jun 2005 18:40:28 -0000	1.8.2.1
@@ -87,4 +87,20 @@
         </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>