Index: openacs-4/packages/lorsm/tcl/lorsm-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/tcl/lorsm-procs.xql,v
diff -u -r1.2.2.3 -r1.2.2.4
--- openacs-4/packages/lorsm/tcl/lorsm-procs.xql	19 Jul 2005 21:28:33 -0000	1.2.2.3
+++ openacs-4/packages/lorsm/tcl/lorsm-procs.xql	5 May 2006 16:57:26 -0000	1.2.2.4
@@ -64,7 +64,7 @@
 <fullquery name="lorsm::init.get_live_revision">      
       <querytext>
 
-    select live_revision from cr_items where item_id = :ims_item_id
+    select live_revision from cr_items where item_id = :item_id
 
       </querytext>
 </fullquery>
@@ -74,5 +74,37 @@
          select folder_id from cr_folders where label = 'LORSM Root Folder'
       </querytext>
 </fullquery>
+
+  <fullquery name="callback::MergeShowUserInfo::impl::lorsm.sel_student_track">      
+    <querytext>
+      select track_id from
+      lorsm_student_track
+      where user_id = :user_id
+    </querytext>
+  </fullquery>
+
+  <fullquery name="callback::MergeShowUserInfo::impl::lorsm.sel_student_bookmark">      
+    <querytext>
+      select community_id 
+      from lorsm_student_bookmark
+      where user_id = :user_id
+    </querytext>
+  </fullquery>
   
+  <fullquery name="callback::MergePackageUser::impl::lorsm.student_track">      
+    <querytext>
+      update lorsm_student_track
+      set user_id = :to_user_id
+      where user_id = :from_user_id
+    </querytext>
+  </fullquery>
+  
+  <fullquery name="callback::MergePackageUser::impl::lorsm.student_bookmark">      
+    <querytext>
+      update lorsm_student_bookmark
+      set user_id = :to_user_id
+      where user_id = :from_user_id
+    </querytext>
+  </fullquery>
+  
 </queryset>
\ No newline at end of file