Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/lorsm/www/delivery/applet.adp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/lorsm/www/delivery/applet.tcl'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/lorsm/www/delivery/blank-menu.html'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/lorsm/www/delivery/blank-top.html'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/lorsm/www/delivery/blank.html'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/lorsm/www/delivery/body.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/delivery/body.adp,v diff -u -r1.5 -r1.5.2.1 --- openacs-4/packages/lorsm/www/delivery/body.adp 24 Feb 2005 13:33:22 -0000 1.5 +++ openacs-4/packages/lorsm/www/delivery/body.adp 5 May 2006 17:00:19 -0000 1.5.2.1 @@ -1,25 +1,55 @@ - +<% +# +# +# +# +%> + + + + + + - -

#lorsm.Welcome_to# @course_name@

+ +
+
@course_name@

- #lorsm.Your_Stats# -
- #lorsm.lt_You_have_seen_this_co# @viewed_times@ #lorsm.lt_number_of_times_and_h# @viewed_percent@ % #lorsm.of_the_content# -

- #lorsm.lt_The_last_page_you_vie# @last_page_viewed;noquote@ + Last page viewed: @last_page_viewed;noquote@ + + You have not yet viewed any material from this course. +
- #lorsm.lt_Click_on_menu_to_the_# + Click on the menu items on the left to view course materials + + + + + + + Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/lorsm/www/delivery/bottom.adp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/lorsm/www/delivery/bottom.tcl'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/lorsm/www/delivery/delivery-bottom-bar.adp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/lorsm/www/delivery/delivery-no-index.adp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/lorsm/www/delivery/delivery-scorm.adp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/lorsm/www/delivery/delivery.adp'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/lorsm/www/delivery/exit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/delivery/exit.tcl,v diff -u -r1.2 -r1.2.2.1 --- openacs-4/packages/lorsm/www/delivery/exit.tcl 17 May 2005 17:03:40 -0000 1.2 +++ openacs-4/packages/lorsm/www/delivery/exit.tcl 5 May 2006 17:00:19 -0000 1.2.2.1 @@ -14,13 +14,43 @@ } -properties { } -validate { } -errors { -} +} -# stamps the time when leaving the delivery environment +#set the following accordingly +set level "Notice" -if {$track_id != 0} { - lorsm::track::exit -track_id $track_id -} + set track_id [ad_get_client_property lorsm currenttrackid] + set lorsmstudenttrack [ad_get_client_property lorsm studenttrack] + + ns_log $level "EXIT track_id $track_id" + ns_log $level "SCORM lorsmstudenttrack $lorsmstudenttrack" + + if { ! [empty_string_p $lorsmstudenttrack] } { + if { $lorsmstudenttrack == 0 } { + lorsm::track::exit -track_id $track_id } else { + #speficic for courses for which istrackable is on + lorsm::track::exit -track_id $lorsmstudenttrack } + ns_log $level "SCORM exiting a scorm course which didnt'actually FINISH" + } else { + ns_log $level "SCORM exiting a scorm course which never INITED" + } + + #unset the CLIENT properties + ad_set_client_property lorsm currenttrackid "" + ad_set_client_property lorsm studenttrack "" + if { $track_id == 0 || $track_id == "" } { + ns_log $level "SCORM leaving non rte-inited (or better a rte-finished) course" + } else { + ns_log $level "SCORM leaving course which had been rte-inited but NOT FINISHED (user forcing exit before time) (lorsm_cmi_core.track_id=$track_id)" + } + if { $lorsmstudenttrack == 0 || $lorsmstudenttrack == "" } { + ns_log $level "SCORM leaving non istrackable course" + } else { + ns_log $level "SCORM leaving course which was either istrackable or rte-inited (lorsm_student_track.track_id=$lorsmstudenttrack" + } + # redirects -ad_returnredirect $return_url +ns_log Warning "RETURN $return_url" + + ad_returnredirect $return_url Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/lorsm/www/delivery/header.html'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/lorsm/www/delivery/index.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/delivery/index.adp,v diff -u -r1.3 -r1.3.2.1 --- openacs-4/packages/lorsm/www/delivery/index.adp 17 May 2005 17:03:40 -0000 1.3 +++ openacs-4/packages/lorsm/www/delivery/index.adp 5 May 2006 17:00:19 -0000 1.3.2.1 @@ -1,7 +1,4 @@ - -@course_name@ - - - - - + + \ No newline at end of file Index: openacs-4/packages/lorsm/www/delivery/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/delivery/index.tcl,v diff -u -r1.4 -r1.4.2.1 --- openacs-4/packages/lorsm/www/delivery/index.tcl 17 May 2005 17:03:40 -0000 1.4 +++ openacs-4/packages/lorsm/www/delivery/index.tcl 5 May 2006 17:00:19 -0000 1.4.2.1 @@ -9,49 +9,85 @@ @arch-tag: 64f3397b-4558-4298-a995-fc63e472f2a1 @cvs-id $Id$ } { + menu_off:integer,notnull,optional man_id:integer,notnull + item_id:integer,notnull,optional ims_id:integer,notnull,optional } -properties { } -validate { } -errors { } + +set debuglevel 0 +ad_set_client_property lorsm debuglevel $debuglevel + +set ses_renew [ad_parameter -package_id [ad_acs_kernel_id] SessionRenew security 300] + +if { ! [info exists menu_off] } { + set menu_off 0 +} + +if { [info exists item_id] } { + ad_set_client_property lorsm ims_id $item_id + if { ! [info exists ims_id] } { + set ims_id $item_id + } +} else { + ad_set_client_property lorsm ims_id "" + ns_log notice "UNSETTING LORSM IMS_ID '[ad_conn url]'" +} + if { [info exists ims_id] } { set item_id $ims_id - + ad_set_client_property lorsm ims_id $ims_id + ns_log notice "SETTING LORSM IMS_ID = '${ims_id}' '[ad_conn url]'" set body_url [export_vars -base "record-view" -url {item_id man_id}] } # Get the course name if {[db_0or1row manifest " select - cp.course_name, - cp.fs_package_id + cp.course_name, + cp.fs_package_id, + isscorm, + pf.folder_name, + pf.format_name from - ims_cp_manifests cp + ims_cp_manifests cp, + lorsm_course_presentation_formats pf where cp.man_id = :man_id - and cp.parent_man_id = 0"]} { + and cp.parent_man_id = 0 + and cp.course_presentation_format = pf.format_id "]} { # Course Name if {[empty_string_p $course_name]} { - set course_name "[_ lorsm.No_Course_Name]" + set course_name "No Course Name" } } else { - set course_name "[_ lorsm.No_Course_Name]" + set course_name "No Course Name" } +if {$isscorm} { + set folder_name "delivery-scorm" +} +set return_url [dotlrn_community::get_community_url [dotlrn_community::get_community_id]] + # Student tracking set package_id [ad_conn package_id] set community_id [dotlrn_community::get_community_id] set user_id [ad_conn user_id] +ad_set_client_property lorsm currentcourse $man_id + if {[lorsm::track::istrackable -course_id $man_id -package_id $package_id]} { - set track_id [lorsm::track::new \ -user_id $user_id \ -community_id $community_id \ -course_id $man_id] + ad_set_client_property lorsm studenttrack $track_id } else { set track_id 0 + ad_set_client_property lorsm studenttrack 0 } Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/lorsm/www/delivery/keepalive.adp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/lorsm/www/delivery/keepalive.tcl'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/lorsm/www/delivery/menu.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/delivery/menu.adp,v diff -u -r1.4 -r1.4.2.1 --- openacs-4/packages/lorsm/www/delivery/menu.adp 17 May 2005 17:03:40 -0000 1.4 +++ openacs-4/packages/lorsm/www/delivery/menu.adp 5 May 2006 17:00:19 -0000 1.4.2.1 @@ -1,164 +1,323 @@ - - - - - - - - - - - - - - - - #lorsm.Exit_Course#
#lorsm.return_to_LRN# - -
- - - - - - - + + + + + + + + + + + + + + + +
+
+ +
+
+ +
+ + Exit Course + +
+ + + +
+ + + + + +Menu not available. + +
+ + +
+ +debug is: ON + + + + Index: openacs-4/packages/lorsm/www/delivery/menu.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/delivery/menu.tcl,v diff -u -r1.3.2.1 -r1.3.2.2 --- openacs-4/packages/lorsm/www/delivery/menu.tcl 23 Jun 2005 15:44:27 -0000 1.3.2.1 +++ openacs-4/packages/lorsm/www/delivery/menu.tcl 5 May 2006 17:00:19 -0000 1.3.2.2 @@ -11,24 +11,26 @@ } { man_id:integer,notnull ims_id:integer,notnull,optional + menu_off:integer,notnull,optional track_id:integer,notnull } -properties { } -validate { } -errors { } +set debuglevel [ad_get_client_property lorsm debuglevel] -set orgs_id [db_list_of_lists get_org_id { } ] -set items_list [list] -foreach org_id $orgs_id { - append items_list " [lorsm::get_items_indent -org_id $org_id]" -} +set org_id [db_string get_org_id { } ] +set items_list [lorsm::get_items_indent -org_id $org_id] template::util::list_of_lists_to_array $items_list items_array set fs_package_id [db_string get_fs_package_id { } -default "" ] set community_id [dotlrn_community::get_community_id] set counter 1 set user_id [ad_conn user_id] +if { ![info exists menu_off] } { + set menu_off 0 +} proc generate_tree_menu { items index rlevel } { # This function is recursive Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/lorsm/www/delivery/popup.adp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/lorsm/www/delivery/popup.tcl'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/lorsm/www/delivery/record-view.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/delivery/record-view.tcl,v diff -u -r1.2.2.1 -r1.2.2.2 --- openacs-4/packages/lorsm/www/delivery/record-view.tcl 13 Jun 2005 15:10:56 -0000 1.2.2.1 +++ openacs-4/packages/lorsm/www/delivery/record-view.tcl 5 May 2006 17:00:19 -0000 1.2.2.2 @@ -25,19 +25,21 @@ set ns_item_id $item_id set revision_id $item_id +ad_set_client_property lorsm ims_id $item_id + set item_id [lorsm::delivery::get_item_id -revision_id $revision_id] set folder_id [lorsm::delivery::get_folder_id_from_man_id -man_id $man_id] set lors_root [lorsm::get_root_folder_id] set folder_name [lorsm::delivery::get_folder_name -folder_id $folder_id] set content_root [lorsm::delivery::get_item_id_from_name_parent -name $folder_name -parent_id $lors_root] - +ns_log notice "record-view folder_id='${folder_id}' lors_root='${lors_root}' folder_name='${folder_name}' content_root='${content_root}'" if {[empty_string_p $content_root]} { # This was uploaded with lorsm so we use the folder_id from the table set content_root [lorsm::delivery::get_folder_id_from_man_id -man_id $man_id] } +ns_log notice "record-view content_root='${content_root}'" - set url2 $folder_name # Get the href of the item Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/lorsm/www/delivery/scorm.css'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/lorsm/www/delivery/servlet.tcl'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/lorsm/www/delivery/stuff.jar =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/delivery/stuff.jar,v diff -u -r1.1 -r1.1.2.1 Binary files differ Index: openacs-4/packages/lorsm/www/delivery/Images/exit.png =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/delivery/Images/exit.png,v diff -u -r1.1 -r1.1.2.1 Binary files differ Index: openacs-4/packages/lorsm/www/delivery/Images/home.png =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/delivery/Images/home.png,v diff -u -r1.1 -r1.1.2.1 Binary files differ Index: openacs-4/packages/lorsm/www/delivery/Images/next.png =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/delivery/Images/next.png,v diff -u -r1.1 -r1.1.2.1 Binary files differ Index: openacs-4/packages/lorsm/www/delivery/Images/nexthide.png =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/delivery/Images/nexthide.png,v diff -u -r1.1 -r1.1.2.1 Binary files differ Index: openacs-4/packages/lorsm/www/delivery/Images/prev.png =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/delivery/Images/prev.png,v diff -u -r1.1 -r1.1.2.1 Binary files differ Index: openacs-4/packages/lorsm/www/delivery/Images/prevhide.png =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/delivery/Images/prevhide.png,v diff -u -r1.1 -r1.1.2.1 Binary files differ Index: openacs-4/packages/lorsm/www/delivery/view/index-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/delivery/view/index-postgresql.xql,v diff -u -r1.1 -r1.1.4.1 --- openacs-4/packages/lorsm/www/delivery/view/index-postgresql.xql 4 Sep 2004 14:51:26 -0000 1.1 +++ openacs-4/packages/lorsm/www/delivery/view/index-postgresql.xql 5 May 2006 17:00:20 -0000 1.1.4.1 @@ -11,5 +11,17 @@ + + + select content_item__get_id(:url, :content_root, 'f') as item_id + + + + + select i.ims_item_id as imsitem_id from ims_cp_items_to_resources i, ims_cp_files f where f.file_id=:file_id and i.res_id=f.res_id; + + + + Index: openacs-4/packages/lorsm/www/delivery/view/index.vuh =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/delivery/view/index.vuh,v diff -u -r1.2 -r1.2.2.1 --- openacs-4/packages/lorsm/www/delivery/view/index.vuh 17 May 2005 17:03:40 -0000 1.2 +++ openacs-4/packages/lorsm/www/delivery/view/index.vuh 5 May 2006 17:00:20 -0000 1.2.2.1 @@ -76,6 +76,6 @@ append page "The item is either not available on this server or it is not in a publishable state " append page "Unpublished items can be viewed via the CMS interface if the CMS package is installed.
" append page "[ad_footer]" - doc_return 200 text/html $page + doc_return 404 text/html $page }