Index: openacs-4/packages/lorsm/www/delivery-no-index/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/delivery-no-index/index.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/lorsm/www/delivery-no-index/index.tcl	22 Apr 2005 09:10:55 -0000	1.1
+++ openacs-4/packages/lorsm/www/delivery-no-index/index.tcl	26 Apr 2005 08:56:24 -0000	1.2
@@ -10,17 +10,13 @@
     @cvs-id $Id$
 } {
     man_id:integer,notnull
-    ims_id:integer,notnull,optional
 } -properties {
 } -validate {
 } -errors {
 }
 
-if { [info exists ims_id] } {
-    set item_id $ims_id
-    
-    set body_url [export_vars -base "record-view" -url {item_id man_id}]
-}
+set user_id [ad_conn user_id]
+set community_id [dotlrn_community::get_community_id]
 
 # Get the course name
 if {[db_0or1row manifest "
@@ -41,17 +37,64 @@
     set course_name "[_ lorsm.No_Course_Name]"
 }
 
-# Student tracking
-set package_id [ad_conn package_id]
-set community_id [dotlrn_community::get_community_id]
-set user_id [ad_conn user_id]
+db_0or1row get_last_viewed {
+    select item_id as imsitem_id, coalesce(acs_object__name(object_id),'Item '||object_id) as last_page_viewed
+    from views v,
+         ims_cp_items i,
+         ims_cp_organizations o
+    where v.viewer_id = :user_id
+          and v.object_id = i.item_id
+          and i.org_id = o.org_id
+          and o.man_id = :man_id
+    order by v.last_viewed desc
+    limit 1
+}
 
-if {[lorsm::track::istrackable -course_id $man_id -package_id $package_id]} {
+set all_items [db_list get_total_items {
+    select i.item_id
+    from ims_cp_items i,
+    ims_cp_organizations o
+    where o.man_id = :man_id
+    and i.org_id = o.org_id   
+}]
+set total_item_count [llength $all_items]
+set viewed_items [db_list get_viewed_items "
+            select v.object_id
+              from views v
+             where v.viewer_id = :user_id
+	     and v.object_id in ([join $all_items ,])
+        "]
+set viewed_item_count [llength $viewed_items]
+set viewed_percent [lc_numeric [expr [expr $viewed_item_count * 1.00] / $total_item_count * 100] "%.2f"]
+
+#Get times viewed
+
+set viewed_times [db_string select_viewed_times "
+             select count(*) 
+             from lorsm_student_track 
+             where community_id = :community_id
+             and course_id = :man_id
+             and user_id = :user_id "]
+
+# Get the course name
+if {[db_0or1row manifest "
+    select 
+           cp.course_name,
+	   cp.fs_package_id
+    from
+           ims_cp_manifests cp
+    where 
+	   cp.man_id = :man_id
+           and  cp.parent_man_id = 0"]} {
     
-    set track_id [lorsm::track::new \
-		      -user_id $user_id \
-		      -community_id $community_id \
-		      -course_id $man_id]
+    # Course Name
+    if {[empty_string_p $course_name]} {
+	set course_name "[_ lorsm.No_Course_Name]"
+    } 
 } else {
-    set track_id 0
+    set course_name "[_ lorsm.No_Course_Name]"
 }
+
+if { !$viewed_item_count } {
+	set first_item_id [lindex [lorsm::get_item_list $man_id $user_id] 1]
+}