Index: openacs-4/packages/lorsm/lib/user-lorsm.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/lib/user-lorsm.tcl,v
diff -u -N -r1.8.2.5 -r1.8.2.5.2.1
--- openacs-4/packages/lorsm/lib/user-lorsm.tcl	11 Jul 2006 19:19:36 -0000	1.8.2.5
+++ openacs-4/packages/lorsm/lib/user-lorsm.tcl	22 Nov 2006 12:09:14 -0000	1.8.2.5.2.1
@@ -7,11 +7,8 @@
     @author Ernie Ghiglione (ErnieG@mm.st)
     @creation-date 2004-06-15
     @arch-tag: 9d893919-9a02-45cd-b6ad-19e3a34ba747
-<<<<<<< user-lorsm.tcl
     @cvs-id $Id$
-=======
-    @cvs-id $Id$
->>>>>>> 1.8.2.4
+
 } {
     
 } -properties {
@@ -101,17 +98,7 @@
 
             # micheles
    	    set context [site_node::get_url_from_object_id -object_id $lorsm_instance_id]
-	    if ([db_0or1row query "
-    		select
-           		cpr.man_id,
-           		cpr.res_id,
-                        'delivery' as needscorte
-    			from
-           			ims_cp_resources cpr
-    			where
-				cpr.man_id = :man_id 
-			order by cpr.scorm_type desc limit 1"
-		]) {
+	    if ([db_0or1row query {} ]) {
 
 
 		ns_log Debug "lorsm - $needscorte"
@@ -128,9 +115,9 @@
         # DEDS: these are expensive
         # and for demo purposes only
         db_0or1row get_last_viewed { }
-        set all_items [db_list get_total_items { }]
+        set all_items [db_list get_total_items {}]
         set total_item_count [llength $all_items]
-        set viewed_items [db_list get_viewed_items { }]
+        set viewed_items [db_list get_viewed_items {}]
         set viewed_item_count [llength $viewed_items]
 
         ns_log Debug "lorsm - viewed_item_count: $viewed_item_count"