Index: openacs-4/packages/lorsm/catalog/lorsm.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/catalog/lorsm.en_US.ISO-8859-1.xml,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/lorsm/catalog/lorsm.en_US.ISO-8859-1.xml	26 May 2005 18:15:52 -0000	1.8
+++ openacs-4/packages/lorsm/catalog/lorsm.en_US.ISO-8859-1.xml	7 Jun 2006 14:05:43 -0000	1.9
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="lorsm" package_version="0.6d2" locale="en_US" charset="ISO-8859-1">
+<message_catalog package_key="lorsm" package_version="0.7d" locale="en_US" charset="ISO-8859-1">
 
   <msg key="_Add">Classification</msg>
   <msg key="_Add_1">Intended End User Role</msg>
@@ -130,6 +130,7 @@
   <msg key="Date">Date:</msg>
   <msg key="Date_1">Date</msg>
   <msg key="Date_of_contribution">Date of contribution</msg>
+  <msg key="Default_delivery">Default delivery?</msg>
   <msg key="Description">Description:</msg>
   <msg key="Description_1">Description</msg>
   <msg key="Descriptions">Descriptions:</msg>
@@ -771,11 +772,13 @@
   <msg key="Scheme_1">Scheme</msg>
   <msg key="SCORM">SCORM?</msg>
   <msg key="SCORM_Package_Info">SCORM Package Info</msg>
+  <msg key="SCORM_session">SCORM session</msg>
   <msg key="SCOs">SCOs</msg>
   <msg key="seconds">seconds</msg>
   <msg key="See_metadata">See metadata</msg>
   <msg key="Semantic_Density">Semantic Density:</msg>
   <msg key="Semantic_Density_1">Semantic Density</msg>
+  <msg key="Sesion_Runtime_Data">Sesion_Runtime_Data</msg>
   <msg key="Set_Course_Options">Set Course Options</msg>
   <msg key="Set_Course_Status">Set Course Status</msg>
   <msg key="Set_Course_Status_">Set Course Status \</msg>
@@ -846,6 +849,7 @@
   <msg key="Welcome_to_LEON">Welcome to LEON</msg>
   <msg key="Yes">Yes</msg>
   <msg key="You_can">You can</msg>
+  <msg key="Your_session_has_expired">Your session has expired. Please notify this problem to the System Administrator.</msg>
   <msg key="Your_Stats">Your Stats:</msg>
   <msg key="Default_delivery">Default delivery?</msg>
   <msg key="SCORM_session">SCORM session</msg>
Index: openacs-4/packages/lorsm/catalog/lorsm.es_ES.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/catalog/lorsm.es_ES.ISO-8859-1.xml,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/lorsm/catalog/lorsm.es_ES.ISO-8859-1.xml	17 May 2005 17:03:39 -0000	1.3
+++ openacs-4/packages/lorsm/catalog/lorsm.es_ES.ISO-8859-1.xml	7 Jun 2006 14:05:43 -0000	1.4
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="lorsm" package_version="0.6d1" locale="es_GT" charset="ISO-8859-1">
+<message_catalog package_key="lorsm" package_version="0.7d" locale="es_ES" charset="ISO-8859-1">
 
   <msg key="_Add">Clasificaci�n</msg>
   <msg key="_Add_1">Papel previsto de Usuario Final</msg>
@@ -97,6 +97,7 @@
   <msg key="Catalog-Entries">Entradas de Catalogo:</msg>
   <msg key="Catalog_1">Cat�logo</msg>
   <msg key="Change">Modificar</msg>
+  <msg key="Classic_Style">Estilo cl�sico</msg>
   <msg key="Classification_Entry">Entrada de Clasificaci�n</msg>
   <msg key="Classification_MD">Clasificaci�n MD</msg>
   <msg key="Classifications">Clasificaciones:</msg>
@@ -111,6 +112,7 @@
   <msg key="Copyright_Info">Info Derechos de Autor</msg>
   <msg key="Cost">Costo:</msg>
   <msg key="Cost_1">Costo</msg>
+  <msg key="Course">Formato de presentaci�n:</msg>
   <msg key="course">curso.</msg>
   <msg key="course_id">course_id</msg>
   <msg key="Course_Index">Indice del Curso</msg>
@@ -123,6 +125,7 @@
   <msg key="Coverage_1">Cobertura</msg>
   <msg key="Created_By">Creado Por:</msg>
   <msg key="Creation_Date">Fecha de Creaci�n</msg>
+  <msg key="Current_Format">Formato actual</msg>
   <msg key="Current_Status">Estado Actual:</msg>
   <msg key="Date">Fecha:</msg>
   <msg key="Date_1">Fecha</msg>
@@ -220,7 +223,6 @@
   <msg key="Location_1">Localizaci�n:</msg>
   <msg key="Locations">Localizaciones:</msg>
   <msg key="Log_Out">Salir</msg>
-  <msg key="lorsm.lt_The_upload_failed_or_">La carga de archivo fall� o posiblemente el archvi est� vac�o</msg>
   <msg key="lt_Add_a_IMSSCORM_Compli">Agregar Curso Compatible con IMS/SCORM</msg>
   <msg key="lt_Add_Aggregation_Level">Agregar Nivel de Agregaci�n</msg>
   <msg key="lt_Add_Annotation_MD_Des">Agregar Anotaci�n de Descripci�n de MD</msg>
@@ -436,6 +438,7 @@
   <msg key="lt_Copyrighted_Descripti">Descripci�n con Derechos de Autor:</msg>
   <msg key="lt_Course_already_part_o">El Curso ya es parte de su clase</msg>
   <msg key="lt_Course_Delivery_Syste">Sistema de Entrega de Cursos para LORS</msg>
+  <msg key="lt_Course_Presentation_S">Estilo de presentaci�n</msg>
   <msg key="lt_Courses_in_your_Repos">Cursos en su Repositorio</msg>
   <msg key="lt_Date_and_Time_descrip">Descripci�n de Fecha y Hora</msg>
   <msg key="lt_Deleting_temporary_fo">Borrando folder temporal...</msg>
@@ -615,6 +618,7 @@
   <msg key="lt_SCORM_complaint_packa">Paquete compatible con SCORM</msg>
   <msg key="lt_Search_for_Learninng_">Buscar Objetos de Aprendizaje en el Repositorio</msg>
   <msg key="lt_Search_Learning_Objec">Buscar Objetos de Aprendizaje</msg>
+  <msg key="lt_Set_Course_Presentati">Establecer formato de presentaci�n</msg>
   <msg key="lt_Set_Course_Track_Opti">Fijar Opciones de Rastreo</msg>
   <msg key="lt_Share_CourseLearning_">Compartir Curso/Objeto de Aprendizaje</msg>
   <msg key="lt_Shared_Courses_in_the">Cursos Compratidos en el Repositorio</msg>
@@ -656,6 +660,7 @@
   <msg key="lt_Upload_IMS_Content_Pa">Subir un paquete de IMS</msg>
   <msg key="lt_Uploading_and_process">Actualizando y procesando su curso, porfavor espere ...</msg>
   <msg key="lt_Use_the_Browse_button">Utilize el bot�n de \&quot;Examinar...\&quot; para localizar su archivo, luego haga click en \&quot;Abrir\&quot;</msg>
+  <msg key="lt_Use_the_Classic_Style">Utilice el estilo cl�sico si su curso no contiene un fichero index y desea disponer de un �ndice. En caso contrario, utilice el estilo &quot;Sin �ndice&quot;.</msg>
   <msg key="lt_valigntop_alignleftis"> valign=&quot;top&quot; align=&quot;left&quot;&gt;%isscorm;noquote%</msg>
   <msg key="lt_Version_of_the_Schema">Versi�n del Esquema. ejemplo: '1.2.1'</msg>
   <msg key="lt_View_Annotation_Metad">Ver la Metadata de Anotaci�n</msg>
@@ -676,6 +681,8 @@
   <msg key="lt_Were_sorry_but_it_app">Lo sentimos, pero parece que no tiene los permisos necesarios para realizar esta operaci�n</msg>
   <msg key="lt_Whether_copyright_or_">Si derechos reservados u otra restriccion se aplique</msg>
   <msg key="lt_Whether_use_of_the_re">Si el uso de este recurso requiere pago</msg>
+  <msg key="lt_With_Bottom_Navigatio">Con barra de navegaci�n abajo</msg>
+  <msg key="lt_Without_LORSM_Index_S">Estilo Sin �ndice</msg>
   <msg key="lt_You_are_about_to_add_">Usted esta apunto de agregar a su clase el curso %course_name%</msg>
   <msg key="lt_You_can_add_courses_a">Puede agregar cursos que y� existan en el repositorio</msg>
   <msg key="lt_You_have_seen_this_co">Usted ha visto este curso</msg>
@@ -763,6 +770,7 @@
   <msg key="Scheme_1">Esquema:</msg>
   <msg key="SCORM">SCORM?</msg>
   <msg key="SCORM_Package_Info">Informaci�n del Paquete SCORM</msg>
+  <msg key="SCORM_session">Sesi�n SCORM</msg>
   <msg key="SCOs">SCOs</msg>
   <msg key="seconds">segundos</msg>
   <msg key="See_metadata">Ver metadata</msg>
@@ -779,6 +787,7 @@
   <msg key="Size_1">Tama�o</msg>
   <msg key="Source">Fuente:</msg>
   <msg key="Source_1">Fuente</msg>
+  <msg key="Start">Empezar el curso</msg>
   <msg key="Start_Course">Iniciar Curso</msg>
   <msg key="Status">Estado:</msg>
   <msg key="Status_1">Estado</msg>
Index: openacs-4/packages/lorsm/catalog/lorsm.es_GT.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/catalog/lorsm.es_GT.ISO-8859-1.xml,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/lorsm/catalog/lorsm.es_GT.ISO-8859-1.xml	17 May 2005 17:03:39 -0000	1.3
+++ openacs-4/packages/lorsm/catalog/lorsm.es_GT.ISO-8859-1.xml	7 Jun 2006 14:05:43 -0000	1.4
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="lorsm" package_version="0.6d1" locale="es_GT" charset="ISO-8859-1">
+<message_catalog package_key="lorsm" package_version="0.7d" locale="es_GT" charset="ISO-8859-1">
 
   <msg key="_Add">Clasificaci�n</msg>
   <msg key="_Add_1">Papel previsto de Usuario Final</msg>
@@ -220,7 +220,6 @@
   <msg key="Location_1">Localizaci�n:</msg>
   <msg key="Locations">Localizaciones:</msg>
   <msg key="Log_Out">Salir</msg>
-  <msg key="lorsm.lt_The_upload_failed_or_">La carga de archivo fall� o posiblemente el archvi est� vac�o</msg>
   <msg key="lt_Add_a_IMSSCORM_Compli">Agregar Curso Compatible con IMS/SCORM</msg>
   <msg key="lt_Add_Aggregation_Level">Agregar Nivel de Agregaci�n</msg>
   <msg key="lt_Add_Annotation_MD_Des">Agregar Anotaci�n de Descripci�n de MD</msg>
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 -r1.10 -r1.11
--- openacs-4/packages/lorsm/lib/user-lorsm.tcl	31 May 2005 22:55:32 -0000	1.10
+++ openacs-4/packages/lorsm/lib/user-lorsm.tcl	7 Jun 2006 14:05:44 -0000	1.11
@@ -27,12 +27,14 @@
 	label "[_ lorsm.Course_Name_1]"
 	display_template {
 	    @d_courses.course_url;noquote@ 
-	    <if @d_courses.admin_p@>
-	    <i>
-            &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-            <a href="${lors_central_url}one-course?item_id=@d_courses.item_id@">[_ lors-central.add_mat]</a>
-            </i>
-	    </if> 
+	    <if @lors_central_p eq 0>
+	       <if @d_courses.admin_p@>
+	       <i>
+               &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+               <a href="${lors_central_url}one-course?item_id=@d_courses.item_id@">[_ lors-central.add_mat]</a>
+               </i>
+	       </if>
+            </if>
 	}
 	html { width 70% }
     }
@@ -67,7 +69,12 @@
 		</center>
 	    }
 	}"
+    } else {
+	set lors_central_p 0
     }
+    set lors_central_p 1
+} else {
+    set lors_central_p 0
 }
 
 
@@ -107,8 +114,9 @@
 
 		set delivery_method $needscorte
 		ns_log Debug "lorsm - $needscorte"
-
-		set course_url "<a href=\"$context$delivery_method/?[export_vars man_id]\" title=\"[_ lorsm.Access_Course]\">$course_name</a>" 
+		
+		set course_url_url [export_vars -base "[lindex $context 0]$delivery_method" -url {man_id}]
+		set course_url "<a href=\"$course_url_url\" title=\"[_ lorsm.Access_Course]\">$course_name</a>" 
 		ns_log Debug "lorsm - course_url: $course_url"
 	    } else {
 		set course_url "NO RESOURCES ERROR"
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/lorsm/sql/postgresql/upgrade/upgrade-0.6d2-0.6d3.sql'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/lorsm/tcl/lorsm-callback-procs.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/lorsm/tcl/lorsm-menu-procs.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/lorsm/tcl/lorsm-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/tcl/lorsm-procs.tcl,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/lorsm/tcl/lorsm-procs.tcl	31 May 2006 10:50:05 -0000	1.12
+++ openacs-4/packages/lorsm/tcl/lorsm-procs.tcl	7 Jun 2006 14:05:44 -0000	1.13
@@ -353,18 +353,20 @@
 	} {
 		db_foreach sql {		               
 			SELECT
-			(tree_level(tree_sortkey) - :indent) as indent,
-			i.ims_item_id as item_id,
+		        i.parent_item,
+			i.ims_item_id,
 			i.item_title as item_title
 			FROM 
-			acs_objects o, ims_cp_items i
+			acs_objects o, ims_cp_items i, cr_items cr
 			WHERE 
 			o.object_type = 'ims_item_object'
 			AND
 			i.org_id = :org_id
 			AND
 			o.object_id = i.ims_item_id
-			AND 
+		        AND 
+                        cr.item_id = ( select item_id from cr_revisions where revision_id = i.ims_item_id)
+	                AND 
 			EXISTS
 			(select 1
 			 from acs_object_party_privilege_map p
@@ -373,9 +375,9 @@
 			 and p.privilege = 'read')
 
 			ORDER BY 
-			o.object_id, tree_sortkey
+			i.sort_order, o.object_id, cr.tree_sortkey
 		} {
-			lappend item_list $item_id
+			lappend item_list $ims_item_id
 		}
 	}
 	return $item_list
@@ -673,3 +675,43 @@
    
     return $object_id
 }
+
+# namespace eval lorsm::merge {
+
+#     ad_proc -callback MergeShowUserInfo -impl lorsm {
+# 	-user_id:required
+#     } {
+# 	Show lors items of one user
+#     } {
+# 	set msg "lors items"
+# 	set result [list $msg]
+
+# 	lappend result [list "Student tracks : [db_list sel_student_track { *SQL* }] " ]
+# 	lappend result [list "Student bookmarks: [db_list sel_student_bookmark { *SQL* }] "]
+	
+# 	return $result
+#     }
+
+#     ad_proc -callback MergePackageUser -impl lorsm {
+# 	-from_user_id:required
+# 	-to_user_id:required
+#     } {
+# 	Merge the lors items of two users.
+# 	The from_user_id is the user that will be 
+#         deleted and all the entries of this user 
+# 	will be mapped to the to_user_id.
+	
+#     } {
+# 	set msg "Merging lors"
+# 	ns_log Notice $msg
+# 	set result [list $msg]
+
+# 	db_transaction {
+# 	    db_dml student_track { *SQL* }
+# 	    db_dml student_bookmark { *SQL* }
+# 	}
+
+# 	set result "lors merge is done"
+# 	return $result
+#     }
+# }
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.3 -r1.4
--- openacs-4/packages/lorsm/tcl/lorsm-procs.xql	26 May 2005 19:00:36 -0000	1.3
+++ openacs-4/packages/lorsm/tcl/lorsm-procs.xql	7 Jun 2006 14:05:44 -0000	1.4
@@ -75,4 +75,36 @@
       </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
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.6
--- 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	7 Jun 2006 14:05:44 -0000	1.6
@@ -1,25 +1,55 @@
-<master  src="/www/blank-master">
+<%
+#
+#<master>
+#
+#
+%>
+<html>
+<head>
+<title></title>
+<link rel="stylesheet" type="text/css" href="/resources/dotlrn/dotlrn-master.css" media="all">
+</head>
+<body border=1>
 <center>
     <script type="text/javascript">
       <!--
+	//this doesn't make sense!
       // Check if we're inside and the tree menu is shown
-      if (window.parent.toc) {
-      window.parent.toc.selectItem(0);
-      }
+      //if (window.parent.toc) {
+	// Check if there is a menu to select from
+	//if (window.parent.toc.menu) {
+	//      window.parent.toc.selectItem(0);
+	//}
+      //}
       //-->
     </script>
-    
-<h1>#lorsm.Welcome_to# <b>@course_name@</h1>
+
+<br>    
+<h1><b>@course_name@</h1>
 <p>
 
-      #lorsm.Your_Stats#
-      <br>
-	#lorsm.lt_You_have_seen_this_co# <b>@viewed_times@</b> #lorsm.lt_number_of_times_and_h# <b>@viewed_percent@ %</b> #lorsm.of_the_content#
-    </p>
     <if @last_page_viewed@ defined>
       <p>
-	#lorsm.lt_The_last_page_you_vie# <b><a href="record-view?man_id=@man_id@&item_id=@imsitem_id@">@last_page_viewed;noquote@</a></b>
+	Last page viewed: <b><a href="record-view?man_id=@man_id@&item_id=@imsitem_id@">@last_page_viewed;noquote@</a></b>
     </if>
+    <else>
+        You have not yet viewed any material from this course.
+    </else>
     <p>
-      #lorsm.lt_Click_on_menu_to_the_#
+      Click on the menu items on the left to view course materials
+    </if>
+<!--      
+      <link rel="stylesheet" type="text/css" href="/resources/acs-templating/forms.css" media="all">
+    
+    
 
+    <script src="/resources/acs-subsite/core.js" language="javascript"></script>
+
+    <textarea id="holdtext" style="display: none;"></textarea>
+    
+-->
+
+
+ </body>
+</html>
+
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.3
--- 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	7 Jun 2006 14:05:44 -0000	1.3
@@ -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.4
--- 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	7 Jun 2006 14:05:44 -0000	1.4
@@ -1,7 +1,4 @@
-<head>
-<title>@course_name@</title>
-
-<frameset cols="200,*" border=0>
-<frame src="menu?man_id=@man_id@<if @ims_id@ defined>&ims_id=@ims_id@</if>&track_id=@track_id@" name="toc">
-<frame src="<if @ims_id@ defined>@body_url;noquote@</if><else>body?man_id=@man_id@</else>" name="content">
-</frameset>
+<html><include src="@folder_name@" &="course_name" &="man_id"
+      &="track_id" &="ims_id" &="ses_renew" &="menu_off"
+      &="debuglevel" &="return_url">
+      </html>
\ 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.5
--- 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	7 Jun 2006 14:05:44 -0000	1.5
@@ -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.5
--- 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	7 Jun 2006 14:05:44 -0000	1.5
@@ -1,164 +1,323 @@
-<html>
-<head>
-<title></title>
-
-<script language="JavaScript">
-<!--
-var tree_tpl = {
-	'target'  : 'content',	// name of the frame links will be opened in
-
-	'icon_e'  : 'tigra/demo1/icons/empty.gif', // empty image
-	'icon_l'  : 'tigra/demo1/icons/line.gif',  // vertical line
-
-        'icon_32' : 'tigra/demo1/icons/base.gif',   // root leaf icon normal
-        'icon_36' : 'tigra/demo1/icons/base.gif',   // root leaf icon selected
-
-	'icon_48' : 'tigra/demo1/icons/base.gif',   // root icon normal
-	'icon_52' : 'tigra/demo1/icons/base.gif',   // root icon selected
-	'icon_56' : 'tigra/demo1/icons/base.gif',   // root icon opened
-	'icon_60' : 'tigra/demo1/icons/base.gif',   // root icon selected
-	
-	'icon_16' : 'tigra/demo1/icons/folder.gif', // node icon normal
-	'icon_20' : 'tigra/demo1/icons/folderopen.gif', // node icon selected
-	'icon_24' : 'tigra/demo1/icons/folderopen.gif', // node icon opened
-	'icon_28' : 'tigra/demo1/icons/folderopen.gif', // node icon selected opened
-
-	'icon_0'  : 'tigra/demo1/icons/page.gif', // leaf icon normal
-	'icon_4'  : 'tigra/demo1/icons/page.gif', // leaf icon selected
-	
-	'icon_2'  : 'tigra/demo1/icons/joinbottom.gif', // junction for leaf
-	'icon_3'  : 'tigra/demo1/icons/join.gif',       // junction for last leaf
-	'icon_18' : 'tigra/demo1/icons/plusbottom.gif', // junction for closed node
-	'icon_19' : 'tigra/demo1/icons/plus.gif',       // junctioin for last closed node
-	'icon_26' : 'tigra/demo1/icons/minusbottom.gif',// junction for opened node
-	'icon_27' : 'tigra/demo1/icons/minus.gif'       // junctioin for last opended node
-};
-
-function openMenu( ims_id ) {
-    if (ims_id.n_depth > 0) {
-	openMenu(ims_id.o_parent);
-	if ( ! ims_id.b_opened )
-          trees[ims_id.o_root.n_id].toggle(ims_id.n_id);
-    } else {
-	return;
-    }
-}
-
-function selectItem( index ) {
-      openMenu ( menu.a_index[index] );
-      trees[menu.a_index[index].o_root.n_id].select(menu.a_index[index].n_id);
-}
-
-function seekAndDestroy( ims_id ) {
-    // Traverse the tree until we reach level 1
-    if ( ims_id.b_opened ) {
-	seekAndDestroy(ims_id.o_parent);
-
-	// Loop through this level and close all other opened items
-	for(var i=0; i<ims_id.o_root.a_children.length; i++) {
-	    if (ims_id.open == ims_id.o_root.a_children[i]) {
-		// Same level, if opened and not in current
-		// active menu, close
-		if (ims_id.o_root.a_children[i].tmF && ims_id.o_root.a_children[i] != ims_id) {
-		    alert('found opened');
-		}
-	    }
-	}
-    } else {
-	return;
-    }
-}
-//-->
-</script>
-
-<script language="JavaScript" src="tigra/tree.js"></script>
-
-<script language="JavaScript">
-<!--
-      var TREE_ITEMS = [['Course Index', 'body?man_id=@man_id@',
-
-<if @TREE_ITEMS@ defined>@TREE_ITEMS;noquote@</if>
-
-]];
-
-      <if @TREE_HASH@ defined>
-      var TREE_HASH = new Array();
-      @TREE_HASH;noquote@
-      </if>
-
-//-->
-</script>
-
-<style type="text/css">
-      body { background-color: #6C9A83 }
-
-      a { font-family: Helvetica,Arial; 
-       font-weight: bold; 
-       font-size: 0.7em;
-       color: #FFFFFF;
-      }
-      
-      a.current a:active { font-family: Helvetica,Arial; 
-       font-weight: bold; 
-       font-size: 0.7em;
-       color: #FFFF00;
-      }
-
-      a.button { 
-       font: 65% arial;
-       border: solid 1px black;
-       background-color: #e1e1e1;
-       text-align: center; 
-       padding: 1px;
-       padding-left: 8px;
-       padding-right: 8px;
-       color: black;
-       text-decoration: none;
-       white-space: nowrap;
-       position: fixed;
-      }
-
-      a.button:link { 
-       text-decoration: none;
-       border: solid 1px black;
-      }
-
-      a.button:visited { 
-       text-decoration: none;
-       border: solid 1px black;
-      }
-
-      a.button:hover { 
-       text-decoration: none;
-       background-color: #ccc;
-       border: solid 1px black;
-      }
-
-      a.button:active { 
-       text-decoration: none;
-       border: solid 1px black;
-      }
-
-</style>
-
-</head>
-
-<body>
-    <a href="exit?man_id=@man_id@&track_id=@track_id@&return_url=@return_url@"  style="display: block; position: fixed;" class="button" target="_top">#lorsm.Exit_Course# <br> #lorsm.return_to_LRN#</a>
-&nbsp;
-<hr size=1>
-    <if @TREE_ITEMS@ defined>
-      <script language="JavaScript">
-<!--
-	menu = new tree (TREE_ITEMS, tree_tpl);
-
-	<if @ims_id@ defined>
-	selectItem(TREE_HASH["ims_id.@ims_id@"]);
-      </if>
-//-->
-      </script>
-    </if>
-</body>
-
-</html>
-
+<html>
+<head>
+<title></title>
+
+<link rel="stylesheet" type="text/css" href="scorm.css" media="all">
+
+
+<script language="JavaScript" src="tigra/tree.js"></script>
+<script language="JavaScript">
+//<!--
+
+var menu=null;
+var API;
+ns4 = (document.layers)? true:false;
+ie4 = (document.all)? true:false;
+
+//function onunload() {
+//alert("unloading me");
+//z=parent.closecontents();
+//if (this.parent.content.window.location.href != "blank.htm") {
+// 	setTimeout("onunload();",1000)
+//	}
+//}
+
+function init() {
+    API = this.document.APIAdapter;
+    debug("before systemcheck");
+    z=systemcheck();
+    debug("after systemcheck");
+    try {
+	if(self.parent.window.frames['AppletContainerFrame'].initialized) {
+	this.toggleBox('menudiv',0);
+	} else {
+	debug("normal");
+	}
+	} catch (err) {
+		debug("applet not available in menu.init();");
+	}
+    //document.applets[0].init();
+    //alert("JAVA-JAVASCRIPT: i've inited myself");
+}
+
+
+function writit(text,id)
+{
+	if (document.getElementById) //Gecko IE5+
+	{
+		x = document.getElementById(id);
+		x.innerHTML = '';
+		x.innerHTML = text;
+	}
+	else if (document.all) // IE 4
+	{
+		x = document.all[id];
+		x.innerHTML = text;
+	}
+	else if (document.layers) //NN4+
+	{
+		x = document.layers[id];
+		text2 = '<P CLASS="testclass">' + text + '</P>';
+		x.document.open();
+		x.document.write(text2);
+		x.document.close();
+	}
+}
+
+
+function toggleBox(szDivID, iState) // 1 visible, 0 hidden
+{
+    if(document.layers)	   //NN4+
+    {
+       document.layers[szDivID].visibility = iState ? "show" : "hide";
+    }
+    else if(document.getElementById)	  //gecko(NN6) + IE 5+
+    {
+        var obj = document.getElementById(szDivID);
+        obj.style.visibility = iState ? "visible" : "hidden";
+    }
+    else if(document.all)	// IE 4
+    {
+        document.all[szDivID].style.visibility = iState ? "visible" : "hidden";
+    }
+}
+
+
+function show(id) {
+        if (ns4) document.layers[id].visibility="view";
+ 	if (ie4) document.all[id].style.visibility = "visible";
+}
+
+function hide(id) {
+	if (ns4) document.layers[id].visibility = "hide";
+    	if (ie4) document.all[id].style.visibility = "hidden";
+}
+
+function changeSCOContent() {
+    alert("LMSFINISH completing: getting out on JAVA APPLET request");
+    parent.window.location.href = "@return_url@";
+    return 1;
+}
+
+function showmenu() {
+	debug("within showmenu");
+    	//if(isNull(document.getElementById("treemenu").style.display)) {
+		debug("showmenu is null !!!");
+	//} else {
+		debug("not showing");
+		//NON SUPPORTATO IN IE5.01
+    		//document.getElementById("treemenu").style.display='block';
+	//}
+}
+
+function showcontent() {
+	parent.frames['content'].location.href = "record-view?man_id=@man_id@&item_id=@ims_item_id@";
+}
+
+function closeme() {
+	parent.window.close();
+}
+
+function getCookie(name)
+{
+    var dc = document.cookie;
+    var prefix = name + "=";
+    var begin = dc.indexOf("; " + prefix);
+    if (begin == -1)
+    {
+        begin = dc.indexOf(prefix);
+        if (begin != 0) return null;
+    }
+    else
+    {
+        begin += 2;
+    }
+    var end = document.cookie.indexOf(";", begin);
+    if (end == -1)
+    {
+        end = dc.length;
+    }
+    return (name+"="+unescape(dc.substring(begin + prefix.length, end)).replace("+"," ").replace("+"," ").replace("+"," ").replace("+"," "));
+}
+
+//MOVED HERE 
+
+var TREE_ITEMS = [['Course Index', 'body?man_id=@man_id@',
+
+<if @TREE_ITEMS@ defined>@TREE_ITEMS;noquote@</if>
+
+]];
+
+<if @TREE_HASH@ defined>
+var TREE_HASH = new Array();
+@TREE_HASH;noquote@
+</if>
+
+var tree_tpl = {
+	'target'  : 'content',	// name of the frame links will be opened in
+
+	'icon_e'  : 'tigra/demo1/icons/empty.gif', // empty image
+	'icon_l'  : 'tigra/demo1/icons/line.gif',  // vertical line
+
+        'icon_32' : 'tigra/demo1/icons/base.gif',   // root leaf icon normal
+        'icon_36' : 'tigra/demo1/icons/base.gif',   // root leaf icon selected
+
+	'icon_48' : 'tigra/demo1/icons/base.gif',   // root icon normal
+	'icon_52' : 'tigra/demo1/icons/base.gif',   // root icon selected
+	'icon_56' : 'tigra/demo1/icons/base.gif',   // root icon opened
+	'icon_60' : 'tigra/demo1/icons/base.gif',   // root icon selected
+	
+	'icon_16' : 'tigra/demo1/icons/folder.gif', // node icon normal
+	'icon_20' : 'tigra/demo1/icons/folderopen.gif', // node icon selected
+	'icon_24' : 'tigra/demo1/icons/folderopen.gif', // node icon opened
+	'icon_28' : 'tigra/demo1/icons/folderopen.gif', // node icon selected opened
+
+	'icon_0'  : 'tigra/demo1/icons/page.gif', // leaf icon normal
+	'icon_4'  : 'tigra/demo1/icons/page.gif', // leaf icon selected
+	
+	'icon_2'  : 'tigra/demo1/icons/joinbottom.gif', // junction for leaf
+	'icon_3'  : 'tigra/demo1/icons/join.gif',       // junction for last leaf
+	'icon_18' : 'tigra/demo1/icons/plusbottom.gif', // junction for closed node
+	'icon_19' : 'tigra/demo1/icons/plus.gif',       // junctioin for last closed node
+	'icon_26' : 'tigra/demo1/icons/minusbottom.gif',// junction for opened node
+	'icon_27' : 'tigra/demo1/icons/minus.gif'       // junctioin for last opended node
+};
+
+function openMenu( ims_id ) {
+    if (ims_id.n_depth > 0) {
+	openMenu(ims_id.o_parent);
+	if ( ! ims_id.b_opened )
+          trees[ims_id.o_root.n_id].toggle(ims_id.n_id);
+    } else {
+	return;
+    }
+}
+
+function selectItem( index ) {
+      openMenu ( menu.a_index[index] );
+      trees[menu.a_index[index].o_root.n_id].select(menu.a_index[index].n_id);
+}
+
+function seekAndDestroy( ims_id ) {
+    // Traverse the tree until we reach level 1
+    if ( ims_id.b_opened ) {
+	seekAndDestroy(ims_id.o_parent);
+
+	// Loop through this level and close all other opened items
+	for(var i=0; i<ims_id.o_root.a_children.length; i++) {
+	    if (ims_id.open == ims_id.o_root.a_children[i]) {
+		// Same level, if opened and not in current
+		// active menu, close
+		if (ims_id.o_root.a_children[i].tmF && ims_id.o_root.a_children[i] != ims_id) {
+		    alert('found opened');
+		}
+	    }
+	}
+    } else {
+	return;
+    }
+}
+
+
+function debug(message) {
+        parent.frames['talk'].document.write("<FONT SIZE=1> menu.adp : "+message+"<HR>");
+        return;
+        }
+
+
+function systemcheck() {
+	debug("within syscheck");
+	AppletContainerFrame=parent.frames['AppletContainerFrame'];
+	//if (ie4) {
+    		//while(isNull(document.getElementById("treemenu").style)) {
+		//	alert("IL MENU e' NULL");
+		//} else {
+		//alert("IL MENU e' NON NULL");
+			//will not hide in explorer 5.01
+    			//document.getElementById("treemenu").style.display='none';
+		//}
+	//	debug("hidden treemenu");
+	//} else {
+	//	hide("treemenu");
+	//}
+	if (AppletContainerFrame.releasemenu==1) {
+		//seems that ie 5.5 is not ie4 so forcing location wouldn't work
+		<if @menu_off@ lt 1>
+		//	if (ie4) {
+			debug("menu released, going to call showmenu");
+		//	showmenu(); 
+		//	} else {
+		//	show("treemenu");
+		//	}
+		</if>
+		<else>
+		parent.frames['content'].location.href = "record-view?man_id=@man_id@&item_id=@item_id@";
+		</else>
+	//do nothing
+	} else {
+	if (AppletContainerFrame.releasemenu==-1) {
+	parent.frames['content'].document.write("<BR><HR>Failed system configuration test<BR>Please check requirements");
+	parent.frames['content'].document.write("<HR>This window will now close.");
+        setTimeout("closeme();",12000)
+	} else {
+	if((AppletContainerFrame.megatries<4)) {
+	parent.frames['content'].document.write("<BR>Please wait. Checking system configuration<BR>");
+	} else {
+	parent.frames['content'].document.write("<BR><HR>Failed system configuration test<BR>Please check requirements");
+	parent.frames['content'].document.write("<HR>This window will now close.");
+        setTimeout("closeme();",12000)
+	}
+	}
+	}
+	return;
+}
+
+
+//-->
+</script>
+
+</head>
+
+
+<BODY onload="return init();">
+
+<div id="usermessage">
+</div>
+
+<div id="abort">
+</div>
+
+<div id="menudiv">
+<if @menu_off@ lt 1>
+    <a href="exit?man_id=@man_id@&track_id=@track_id@&return_url=@return_url@"  style="display: block; position: fixed;" class="button" target="_top">Exit Course</a>
+&nbsp;
+<hr size=1>
+</if>
+
+
+<hr>
+
+<if @TREE_ITEMS@ defined>
+<script language="JavaScript">
+//<!--
+	menu = new tree (this.TREE_ITEMS, this.tree_tpl);
+
+	        <if @ims_id@ defined>
+	        selectItem(this.TREE_HASH["ims_id.@ims_id@"]);
+		</if>
+//-->
+</script>
+</if>
+<else>
+Menu not available.
+</else>
+</div>
+
+
+<HR>
+<if @debuglevel@ gt 0>
+debug is: ON 
+</if>
+
+</BODY>
+</HTML>
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 -r1.4
--- openacs-4/packages/lorsm/www/delivery/menu.tcl	17 May 2005 17:03:40 -0000	1.3
+++ openacs-4/packages/lorsm/www/delivery/menu.tcl	7 Jun 2006 14:05:44 -0000	1.4
@@ -11,12 +11,14 @@
 } {
     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 org_id [db_string get_org_id { } ]
 set items_list [lorsm::get_items_indent -org_id $org_id]
@@ -26,6 +28,9 @@
 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.3 -r1.4
--- openacs-4/packages/lorsm/www/delivery/record-view.tcl	20 May 2005 11:23:51 -0000	1.3
+++ openacs-4/packages/lorsm/www/delivery/record-view.tcl	7 Jun 2006 14:05:44 -0000	1.4
@@ -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
@@ -103,7 +105,7 @@
 	nsv_set delivery_vars [ad_conn session_id] [list]
 
 	nsv_lappend delivery_vars [ad_conn session_id] $content_root
-	ad_returnredirect [export_vars -base view/$href {ims_item_id} ]
+	ad_returnredirect [export_vars -base view/$href {ims_item_id man_id} ]
 	ad_script_abort
     }
 } else {
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.2
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.2
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.2
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.2
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.2
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.2
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.2
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.2
--- 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	7 Jun 2006 14:05:45 -0000	1.2
@@ -11,5 +11,17 @@
       </querytext>
 </fullquery>
 
+<fullquery name="get_item_id">
+      <querytext>
+    select content_item__get_id(:url, :content_root, 'f') as item_id
+      </querytext>
+</fullquery>
  
+<fullquery name="check_file_to_imsitem">
+      <querytext>
+ 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;
+      </querytext>
+</fullquery>
+
+
 </queryset>
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.3
--- 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	7 Jun 2006 14:05:45 -0000	1.3
@@ -4,11 +4,22 @@
     @cvs-id $Id$
 } {    
     { ims_item_id "" }
+    { man_id "" }
 }
- 
+
 # check if the nsv variable exists
 if {![nsv_exists delivery_vars [ad_conn session_id]]} {
-    ad_returnredirect [dotlrn_community::get_community_url [dotlrn_community::get_community_id -package_id [ad_conn package_id]]]
+    if {$man_id ne ""} {
+	db_1row manifest_info { *SQL* }
+	set content_root [fs::get_root_folder -package_id $fs_package_id]
+	if {[nsv_exists delivery_vars [ad_conn session_id]]} {
+	    nsv_unset delivery_vars [ad_conn session_id]
+	}
+	nsv_set delivery_vars [ad_conn session_id] [list]
+	nsv_lappend delivery_vars [ad_conn session_id] $content_root
+    } else {
+	ad_return_complaint 1 "[_ lorsm.Your_session_has_expired]"
+    }
 }
 
 if {[info exists ims_item_id]} {
@@ -76,6 +87,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.<br>"
    append page "[ad_footer]"
-   doc_return 200 text/html $page
+   doc_return 404 text/html $page
 }
 
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/lorsm/www/delivery/view/index.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/lorsm/www/delivery-bottom-bar/body.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/delivery-bottom-bar/body.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/lorsm/www/delivery-bottom-bar/body.tcl	18 May 2005 07:45:24 -0000	1.1
+++ openacs-4/packages/lorsm/www/delivery-bottom-bar/body.tcl	7 Jun 2006 14:05:45 -0000	1.2
@@ -14,20 +14,20 @@
 
 
 db_0or1row get_last_viewed {
-    select item_id as imsitem_id, coalesce(acs_object__name(object_id),'Item '||object_id) as last_page_viewed
+    select ims_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 v.object_id = i.ims_item_id
           and i.org_id = o.org_id
           and o.man_id = :man_id
     order by v.last_viewed desc
     limit 1
 }
 
 set all_items [db_list get_total_items {
-    select i.item_id
+    select i.ims_item_id
     from ims_cp_items i,
     ims_cp_organizations o
     where o.man_id = :man_id
Index: openacs-4/packages/lorsm/www/delivery-bottom-bar/bottom.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/delivery-bottom-bar/bottom.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/lorsm/www/delivery-bottom-bar/bottom.tcl	18 May 2005 07:45:24 -0000	1.1
+++ openacs-4/packages/lorsm/www/delivery-bottom-bar/bottom.tcl	7 Jun 2006 14:05:45 -0000	1.2
@@ -31,12 +31,12 @@
 set item_list [lorsm::get_item_list $man_id $user_id]
 
 set last_item_viewed [db_string select_last_item_viewed {    
-	select item_id
+	select ims_item_id
 	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 v.object_id = i.ims_item_id
 	and i.org_id = o.org_id
 	and o.man_id = :man_id
 	order by v.last_viewed desc
Index: openacs-4/packages/lorsm/www/delivery-bottom-bar/record-view.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/delivery-bottom-bar/record-view.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/lorsm/www/delivery-bottom-bar/record-view.tcl	18 May 2005 07:45:24 -0000	1.1
+++ openacs-4/packages/lorsm/www/delivery-bottom-bar/record-view.tcl	7 Jun 2006 14:05:45 -0000	1.2
@@ -31,9 +31,9 @@
 
 set url2 "[db_string select_folder_key {select key from fs_folders where folder_id = :folder_id}]/"
 
-set href [db_string href "select href from ims_cp_resources r, ims_cp_items_to_resources ir where ir.item_id = :item_id and ir.res_id = r.res_id" -default ""]
+set href [db_string href "select href from ims_cp_resources r, ims_cp_items_to_resources ir where ir.ims_item_id = :item_id and ir.res_id = r.res_id" -default ""]
 
-db_1row item_info "select title from ims_cp_items where item_id = :item_id"
+db_1row item_info "select item_title from ims_cp_items where ims_item_id = :item_id"
 
 set fs_item_id [fs::get_item_id -folder_id $folder_id -name $href]
 
Index: openacs-4/packages/lorsm/www/delivery-bottom-bar/view/index.vuh
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/delivery-bottom-bar/view/index.vuh,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/lorsm/www/delivery-bottom-bar/view/index.vuh	18 May 2005 07:45:24 -0000	1.1
+++ openacs-4/packages/lorsm/www/delivery-bottom-bar/view/index.vuh	7 Jun 2006 14:05:45 -0000	1.2
@@ -5,26 +5,31 @@
     @creation-date Unknown
     @cvs-id $Id$
 } {    
-	{item_id ""}
+	{ims_item_id ""}
 }
 
 # check if the nsv variable exists
 if {![nsv_exists delivery_vars [ad_conn session_id]]} {
     ad_returnredirect [dotlrn_community::get_community_url [dotlrn_community::get_community_id -package_id [ad_conn package_id]]]
 }
 
-if {![empty_string_p $item_id]} {
-    lorsm::set_ims_item_id $item_id
+if {[info exists ims_item_id]} {
+    lorsm::set_ims_item_id $ims_item_id
 }
 
+
 # Get the paths
 set the_root [ns_info pageroot]
 set the_url [ad_conn path_info]
 
 set content_type "content_revision"
 
 set content_root [lindex [nsv_get delivery_vars [ad_conn session_id]] 0]
+set ns_item_id [lindex [nsv_get delivery_vars [ad_conn session_id]] 1]
+set ims_item_id [lorsm::get_ims_item_id]
 
+set the_url [join [lrange [split $the_url "/"] 1 end] "/"]
+
 set template_root [db_string template_root ""]
 
 # Serve the page
@@ -33,10 +38,40 @@
 # as though it's been passed by reference.   This requires that the redirect treat the
 # path as an absolute path within the filesystem.
 
+# MIGUELM: we need a way to use other content root not only the one for the course since we can have
+#          items from other courses
+
+set item_id [content::item::get_id -item_path $the_url -root_folder_id $content_root -resolve_index "f"]
+
+if { [empty_string_p $item_id] } {
+    # This item was probably added. We need to check if the item exist on other folder.
+    # So we will get the first part of the URL
+    set item_id [lorsm::delivery::get_item_other_folder -url $the_url]
+}
+
+# To get the revision_id (file_id) we need to show here we have to items here 
+# one is the item_id that is recived on record-view page from the menu 
+# and the other one is the one that holds all the revisions for one file
+set revision_id [lorsm::delivery::get_file_id_from_ims_item_id -ims_item_id $ns_item_id -item_id $item_id]
+
+if { [empty_string_p $revision_id] } {
+    # Is a reference to an image or some other resource inside the page, this items don't 
+    # have an entry in ims_cp_files table
+    set revision_id [item::get_best_revision $item_id]
+}
+
+if { ![empty_string_p $revision_id] } {
+    # We catch the revision id using the_url and content root
+    cr_write_content -revision_id $revision_id
+} else {
+    # Write the ims_item_id that we recieve on the page since this is the one that holds the content
+    cr_write_content -revision_id $ims_item_id	
+}
+
 if { [lorsm::init the_url the_root  $content_root $template_root public "" $content_type] } {
 
     # we introduced our own template
-    rp_internal_redirect -absolute_path [acs_root_dir]/templates/lorsm-default
+    rp_internal_redirect -absolute_path [acs_root_dir]/templates/lorsm-no-index
 
 } else {
   # ns_returnnotfound