Index: openacs-4/packages/lorsm/lorsm.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/lorsm.info,v
diff -u -N -r1.5.2.2 -r1.5.2.3
--- openacs-4/packages/lorsm/lorsm.info	2 Feb 2005 16:13:27 -0000	1.5.2.2
+++ openacs-4/packages/lorsm/lorsm.info	27 May 2005 15:16:22 -0000	1.5.2.3
@@ -8,13 +8,13 @@
     <singleton-p>f</singleton-p>
     <auto-mount>lorsm</auto-mount>
 
-    <version name="0.6d2" url="http://openacs.org/repository/download/apm/lorsm-0.6d2.apm">
+    <version name="0.6d3" url="http://openacs.org/repository/download/apm/lorsm-0.6d3.apm">
         <owner url="mailto:ernieg@mm.st">Ernie Ghiglione</owner>
         <summary>Application to manage the services from the Learning Object Repository. </summary>
-        <release-date>2005-01-19</release-date>
+        <release-date>2005-05-27</release-date>
         <description format="text/html">This application manages the services from the Learning Object Repository: upload courses, manage and create metadata, delete resources and courses. </description>
 
-        <provides url="lorsm" version="0.6d2"/>
+        <provides url="lorsm" version="0.6d3"/>
         <requires url="lors" version="0.4d"/>
         <requires url="views" version="0.1d"/>
 
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.4.2.1 -r1.4.2.2
--- openacs-4/packages/lorsm/lib/user-lorsm.tcl	5 Jan 2005 17:01:50 -0000	1.4.2.1
+++ openacs-4/packages/lorsm/lib/user-lorsm.tcl	27 May 2005 15:16:22 -0000	1.4.2.2
@@ -17,7 +17,6 @@
 
 #set package_id $list_of_packages_ids
 
-
 template::list::create \
     -name d_courses \
     -multirow d_courses \
@@ -27,9 +26,9 @@
     -elements {
         course_name {
             label "[_ lorsm.Course_Name_1]"
-            display_col course_name
+	    display_template {@d_courses.course_url;noquote@}
 	    html { width 70% }
-            link_url_eval {[site_node::get_url_from_object_id -object_id $lorsm_instance_id]delivery/?[export_vars man_id]}
+
             link_html {title "[_ lorsm.Access_Course]"}
         }
         subject {
@@ -55,7 +54,7 @@
 
 foreach package $package_id {
 
-    db_multirow -extend { ims_md_id last_viewed total_item_count viewed_item_count viewed_percent} -append  d_courses select_d_courses {
+    db_multirow -extend { ims_md_id last_viewed total_item_count viewed_item_count viewed_percent course_url } -append  d_courses select_d_courses {
 	select 
 	   cp.man_id,
            cp.course_name,
@@ -65,11 +64,14 @@
            cp.folder_id,
 	   acs.creation_user,
 	   acs.creation_date,
+	   pf.folder_name,
+	   pf.format_name,
 	   acs.context_id,
            cpmc.community_id,
            cpmc.lorsm_instance_id
 	from
-           ims_cp_manifests cp, acs_objects acs, ims_cp_manifest_class cpmc
+           ims_cp_manifests cp, acs_objects acs, ims_cp_manifest_class cpmc, 
+           lorsm_course_presentation_formats pf
 	where 
            cp.man_id = acs.object_id
 	and
@@ -79,9 +81,16 @@
            cpmc.lorsm_instance_id = :package
 	and
            cpmc.isenabled = 't'
+	and
+	   pf.format_id = cp.course_presentation_format
 	order by acs.creation_date desc
     } {
         set ims_md_id $man_id
+	if { [string eq $format_name "default"] } {
+			set course_url "<a href=\"[site_node::get_url_from_object_id -object_id $lorsm_instance_id]${folder_name}/?[export_vars man_id]\" title=\"[_ lorsm.Access_Course]\">$course_name</a>" 
+	} else {
+			set course_url "<a href=\"[site_node::get_url_from_object_id -object_id $lorsm_instance_id]${folder_name}/?[export_vars man_id]\" title=\"[_ lorsm.Access_Course]\" target=_blank>$course_name</a>" 
+	}
         # DEDS: these are expensive
         # and for demo purposes only
         db_0or1row get_last_viewed {
Index: openacs-4/packages/lorsm/sql/postgresql/lorsm-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/sql/postgresql/lorsm-create.sql,v
diff -u -N -r1.1.2.1 -r1.1.2.2
--- openacs-4/packages/lorsm/sql/postgresql/lorsm-create.sql	5 Jan 2005 17:01:50 -0000	1.1.2.1
+++ openacs-4/packages/lorsm/sql/postgresql/lorsm-create.sql	27 May 2005 15:16:23 -0000	1.1.2.2
@@ -89,4 +89,22 @@
 Multiplicity: One bookmark per course/class/student
 ';
 
+-- Course presentation formats
+
+create table lorsm_course_presentation_formats (
+	format_id  			integer
+						constraint lorsm_cpformats_pk
+						primary key,
+	format_pretty_name	varchar(200),
+	format_name 		varchar(100),
+	folder_name			varchar(100)
+);
+
+create index lorsm_cpformats__format_id_idx on lorsm_course_presentation_formats (format_id);
+
+comment on table lorsm_course_presentation_formats is '
+This table stores the available presentation formats for the courses. Its contains the pretty name
+for the format, an id, and the folder in packages/lorsm/www/ where the presentation format is stored.
+Currently just two presentation formats exists, delivery and delivery-wihout-index, which we store on creation';
+
 \i lorsm-packages.sql
Index: openacs-4/packages/lorsm/sql/postgresql/upgrade/upgrade-0.6d2-0.6d3.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/sql/postgresql/upgrade/upgrade-0.6d2-0.6d3.sql,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/lorsm/sql/postgresql/upgrade/upgrade-0.6d2-0.6d3.sql	27 May 2005 15:16:23 -0000	1.1.2.1
@@ -0,0 +1,105 @@
+-- 
+-- packages/lors/sql/postgresql/upgrade/upgrade-0.6d-0.7d.sql
+-- 
+-- @author jopezku@gmail.com
+-- @cvs-id $Id: upgrade-0.6d2-0.6d3.sql,v 1.1.2.1 2005/05/27 15:16:23 josee Exp $
+--
+
+-- Adds the option to show a course with different presentation formats 
+--
+
+-- Course presentation formats
+
+create table lorsm_course_presentation_formats (
+	format_id  			integer
+						constraint lorsm_cpformats_pk
+						primary key,
+	format_pretty_name	varchar(200),
+	format_name 		varchar(100),
+	folder_name			varchar(100)
+);
+
+create index lorsm_cpformats__format_id_idx on lorsm_course_presentation_formats (format_id);
+
+comment on table lorsm_course_presentation_formats is '
+This table stores the available presentation formats for the courses. Its contains the pretty name
+for the format, an id, and the folder in packages/lorsm/www/ where the presentation format is stored.
+Currently just tree presentation formats exists, delivery, delivery-wihout-index and delivery-bottom-bar, 
+which we store on creation';
+
+--Change presentation_id to format_id.
+alter table ims_cp_manifests add column course_presentation_format integer;
+
+
+-- Include new field in creation function
+create or replace function ims_manifest__new (
+    integer,   -- manifest_id
+    varchar,   -- course_name
+    varchar,   -- identifier
+    varchar,   -- version
+    varchar,   -- orgs_default
+    boolean,   -- hasmetadata
+    integer,   -- parent_man_id
+    boolean,   -- isscorm 
+    integer,   -- folder_id 
+    integer,   -- fs_package_id
+    timestamp with time zone, -- creation_date
+    integer,   -- creation_user
+    varchar,    -- creation_ip
+    integer,    -- package_id
+    integer,    -- community_id
+    varchar,     -- class_key
+	integer 	-- course_presentation_format
+)
+returns integer as '
+declare
+    p_man_id                		alias for $1;
+    p_course_name           		alias for $2;
+    p_identifier            		alias for $3;
+    p_version               		alias for $4;
+    p_orgs_default          		alias for $5;
+    p_hasmetadata           		alias for $6;
+    p_parent_man_id         		alias for $7;
+    p_isscorm               		alias for $8;
+    p_folder_id             		alias for $9;
+    p_fs_package_id         		alias for $10;
+    p_creation_date         		alias for $11;
+    p_creation_user         		alias for $12;
+    p_creation_ip           		alias for $13;
+    p_package_id            		alias for $14;
+    p_community_id          		alias for $15;
+    p_class_key            	 		alias for $16;
+	p_course_presentation_format	alias for $17;
+
+    v_man_id       integer;
+begin
+        v_man_id := acs_object__new (
+                p_man_id,               -- object_id
+                ''ims_manifest'',       -- object_type
+                p_creation_date,        -- creation_date
+                p_creation_user,        -- creation_user
+                p_creation_ip,          -- creation_ip
+                p_package_id,           -- context_id
+                ''t''                   -- security_inherit_p
+        );
+
+        insert into ims_cp_manifests
+        (man_id, course_name, identifier, version, orgs_default, hasmetadata, parent_man_id, isscorm, folder_id, fs_package_id, course_presentation_format)
+        values
+        (v_man_id, p_course_name, p_identifier, p_version, p_orgs_default, p_hasmetadata, p_parent_man_id, p_isscorm, p_folder_id, p_fs_package_id, p_course_presentation_format);
+
+	-- now we add it to the manifest_class relation table
+
+	insert into ims_cp_manifest_class
+	(man_id, lorsm_instance_id, community_id, class_key, isenabled, istrackable)
+	values
+	(v_man_id, p_package_id, p_community_id, p_class_key, ''t'', ''f'');
+
+
+        return v_man_id;
+end;
+' language 'plpgsql';
+
+
+
+
Index: openacs-4/packages/lorsm/tcl/lorsm-install-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/tcl/lorsm-install-procs.tcl,v
diff -u -N -r1.2.2.2 -r1.2.2.3
--- openacs-4/packages/lorsm/tcl/lorsm-install-procs.tcl	22 Apr 2005 10:20:40 -0000	1.2.2.2
+++ openacs-4/packages/lorsm/tcl/lorsm-install-procs.tcl	27 May 2005 15:16:23 -0000	1.2.2.3
@@ -52,5 +52,20 @@
 
     }
 
+    set pretty_name "[_ lorsm.Classic_Style]"
+    # Insert default values for the course presentation formats
+    db_dml create_default_format {
+	insert into lorsm_course_presentation_formats values (-1,:pretty_name,'default','delivery')
+    }
+    
+    set pretty_name "[_ lorsm.lt_Without_LORSM_Index_S]"
+    db_dml create_no_index_format {
+	insert into lorsm_course_presentation_formats values (-2,:pretty_name,'without_index','delivery-no-index')
+    }
+    
+    set pretty_name "[_ lorsm.lt_With_Bottom_Navigatio]"
+    db_dml create_no_index_format {
+	insert into lorsm_course_presentation_formats values (-3,:pretty_name,'bottom_navigation_bar','delivery-bottom-bar')
+    }
 
 }
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 -N -r1.4.2.1 -r1.4.2.2
--- openacs-4/packages/lorsm/tcl/lorsm-procs.tcl	5 Jan 2005 17:01:51 -0000	1.4.2.1
+++ openacs-4/packages/lorsm/tcl/lorsm-procs.tcl	27 May 2005 15:16:23 -0000	1.4.2.2
@@ -334,7 +334,113 @@
  
 }
 
+ad_proc -public get_item_list { man_id user_id } {
+	set item_list [list]
+	db_foreach organizations {
+		select 
+		org.org_id,
+		org.title as org_title,
+		org.hasmetadata,
+		tree_level(o.tree_sortkey) as indent
+		from
+		ims_cp_organizations org, acs_objects o
+		where
+		org.org_id = o.object_id
+		and
+		man_id = :man_id
+		order by
+		org_id
+	} {
 
+		db_foreach sql {		   
+			SELECT
+			(tree_level(tree_sortkey) - :indent) as indent,
+			i.item_id,
+			i.title as item_title
+			FROM 
+			acs_objects o, ims_cp_items i
+			WHERE 
+			o.object_type = 'ims_item'
+			AND
+			i.org_id = :org_id
+			AND
+			o.object_id = i.item_id
+			AND 
+			EXISTS
+			(select 1
+			 from acs_object_party_privilege_map p
+			 where p.object_id = i.item_id 
+			 and p.party_id = :user_id
+			 and p.privilege = 'read')
+
+			ORDER BY 
+			o.object_id, tree_sortkey
+		} {
+			lappend item_list $item_id
+		}
+	}
+	return $item_list
+}
+
+ad_proc -public record_view { item_id man_id } {
+
+	set viewer_id [ad_conn user_id]
+
+	set views [views::record_view -object_id $item_id -viewer_id $viewer_id]
+
+	set revision_id [item::get_best_revision $item_id]
+
+	db_1row manifest_info "select fs_package_id, folder_id from ims_cp_manifests where man_id = :man_id"
+	set content_root [fs::get_root_folder -package_id $fs_package_id]
+
+	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 ""]
+
+	db_1row item_info "select title from ims_cp_items where item_id = :item_id"
+
+	set fs_item_id [fs::get_item_id -folder_id $folder_id -name $href]
+
+	# If no fs_item_id, this item is probably a folder
+	# Else deliver the page
+	if { ![empty_string_p $fs_item_id] } {
+
+		set fs_revision_id [item::get_best_revision $fs_item_id]
+		set fs_item_mime [item::get_mime_info $fs_revision_id mime_info]
+		
+		
+		if { [string equal -length 4 "text" $mime_info(mime_type)] } {
+			
+			set imsitem_id $item_id
+			
+			#    lorsm::set_content_root content_root
+			lorsm::set_ims_item_id $item_id
+			
+			# we use nsv variables to set the delivery environment this is a
+			# temporary solution until we find something a bit better
+			
+			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 {
+		lorsm::set_ims_item_id $item_id
+		
+		# We have no content, so wipe item_id from the lorsm namespace
+		# This fixes a strange bug if you click a 'no content' menu item
+		# repeatedly and different content appears!
+		if { [info exists lorsm::item_id] } {
+			set lorsm::item_id ""
+		}
+	}
+	
+}
+
 ad_proc -public init { urlvar rootvar {content_root ""} {template_root ""} {context "public"} {rev_id ""} {content_type ""} } {
     
     upvar $urlvar url $rootvar root_path 
Index: openacs-4/packages/lorsm/templates/lorsm-default.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/templates/lorsm-default.adp,v
diff -u -N -r1.2.2.1 -r1.2.2.2
--- openacs-4/packages/lorsm/templates/lorsm-default.adp	5 Jan 2005 17:01:51 -0000	1.2.2.1
+++ openacs-4/packages/lorsm/templates/lorsm-default.adp	27 May 2005 15:16:23 -0000	1.2.2.2
@@ -1,6 +1,6 @@
+<if @html_document_p@ eq 0 >
 <master  src="/www/blank-master">
   <property name="title">@title;noquote@</property>
-
   <if @imsitem_id@ ne "">
     <script type="text/javascript">
       <!--
@@ -22,9 +22,6 @@
     <a href="@community_url@/lorsm/tracking?man_id=@man_id@<if @return_url@ defined>&@return_url;noquote@</if>" target="_top"><img src="/resources/ZoomIn16.gif" border=0 align="right" alt="image"></a>
   </if>
 
-
-  <h3><img src="/resources/Open16.gif">@title;noquote@</h3>
-  
   <blockquote>
 
     <if @text@ defined>
@@ -38,8 +35,11 @@
     </ul>
 
     <br>
-      
   </blockquote>
   <if @parent_item@>
     <a href="@parent_href@"><img border="0" src="/resources/right.gif" align="right" alt="Back to Parent"></a>
-  </if>
\ No newline at end of file
+  </if>
+</if>
+<else>
+@text;noquote@
+</else>
\ No newline at end of file
Index: openacs-4/packages/lorsm/templates/lorsm-default.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/templates/lorsm-default.tcl,v
diff -u -N -r1.2.2.2 -r1.2.2.3
--- openacs-4/packages/lorsm/templates/lorsm-default.tcl	22 Jan 2005 00:30:18 -0000	1.2.2.2
+++ openacs-4/packages/lorsm/templates/lorsm-default.tcl	27 May 2005 15:16:23 -0000	1.2.2.3
@@ -8,7 +8,7 @@
 	# It's a file.
 	cr_write_content -revision_id $content(revision_id)
 	ad_script_abort
-    } elseif { [string equal "text/css" $content(mime_type)]} {
+    } elseif { [string equal "text/css" $content(mime_type)] || [string equal "text/xml" $content(mime_type) ]} {
 	# we treat CSS files as if they would be binaries and deliver
 	# them straight to the browser (maybe we should do the same
 	# thing for XML files (?)
@@ -19,17 +19,22 @@
     # Ordinary text/* mime type.
     template::util::array_to_vars content
 
-
-
     set text [cr_write_content -string -revision_id $revision_id]
-
-    if { ![string equal "text/html" $content(mime_type)] &&  ![string equal "text/xml" $content(mime_type)] } {
-	set text [ad_html_text_convert -from $mime_type -to text/html $text]
+	
+    if { ![string equal "text/html" $content(mime_type)] || ![string equal "text/xml" $content(mime_type)]} {
+		set text [ad_html_text_convert -from $mime_type -to text/html $text]
     }
 }
 
 set imsitem_id [lorsm::get_ims_item_id] 
 
+set html_document_p 0
+if { [string eq $content(mime_type) "text/html"] && [regexp -nocase {<html>} $text match] } {
+	set html_document_p 1
+	# parent window
+ 	regsub -all -nocase {target=.?(_top)} $text {target="content"} text
+} 
+
 # We set all this blank variables in the case that the ims_item does
 # not have a resource id
 
Index: openacs-4/packages/lorsm/templates/lorsm-no-index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/templates/lorsm-no-index.adp,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/lorsm/templates/lorsm-no-index.adp	27 May 2005 15:16:23 -0000	1.1.4.2
@@ -0,0 +1,2 @@
+@text;noquote@
+
Index: openacs-4/packages/lorsm/templates/lorsm-no-index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/templates/lorsm-no-index.tcl,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/lorsm/templates/lorsm-no-index.tcl	27 May 2005 15:16:23 -0000	1.5.2.2
@@ -0,0 +1,98 @@
+# Put the current revision's attributes in a onerow datasource named "content".
+# The detected content type is "content_revision".
+
+lorsm::get_content content_revision
+set user_id [ad_conn user_id]
+
+if { [info exists content(item_id)] } {
+    if { ![string equal -length 4 "text" $content(mime_type)] } {
+		# It's a file.
+		cr_write_content -revision_id $content(revision_id)
+		ad_script_abort
+	} elseif { [string equal "text/css" $content(mime_type)] || [string equal "text/xml" $content(mime_type) ]} {
+		# we treat CSS files as if they would be binaries and deliver
+		# them straight to the browser (maybe we should do the same
+		# thing for XML files (?)
+		cr_write_content -revision_id $content(revision_id)
+		ad_script_abort
+    }
+	
+
+    # Ordinary text/* mime type.
+    template::util::array_to_vars content
+	
+    set text [cr_write_content -string -revision_id $revision_id]
+	
+    if { ![string equal "text/html" $content(mime_type)] || ![string equal "text/xml" $content(mime_type)]} {
+		set text [ad_html_text_convert -from $mime_type -to text/html $text]
+    }
+}
+
+if { [string eq $content(mime_type) "text/html"] && [regexp -nocase {<html>} $text match] } {
+		
+	if { [db_0or1row get_imsitem_id {
+		select map.item_id as viewed_item_id, o.man_id
+		from ims_cp_items_to_resources map, ims_cp_files f, ims_cp_organizations o, ims_cp_items i
+		where f.file_id = :item_id
+		and f.res_id = map.res_id
+		and map.item_id = i.item_id 
+		and i.org_id = o.org_id
+	}] } {
+		# record view
+		set item_list [lorsm::get_item_list $man_id $user_id]
+		set litem_list [llength $item_list]
+
+		if { ![expr $litem_list - [lsearch -exact $item_list $viewed_item_id] -1] } {
+			# last item, it's a special case
+			set last_item_viewed [db_string select_last_item_viewed {    
+				select 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 i.org_id = o.org_id
+				and o.man_id = :man_id
+				order by v.last_viewed desc
+				limit 1
+			} -default "no item"]
+			if { !([lsearch -exact [lrange $item_list [expr $litem_list - 2] $litem_list] $last_item_viewed] != -1) && ![string eq $last_item_viewed "no item"] } {
+				set viewed_item_id [lindex $item_list [expr [lsearch -exact $item_list $viewed_item_id] - 1]]
+			}
+		} else {
+			set viewed_item_id [lindex $item_list [expr [lsearch -exact $item_list $viewed_item_id] - 1]]
+		}
+		if { [lsearch -exact $item_list $viewed_item_id] >= 0 } {
+		    lorsm::record_view $viewed_item_id $man_id
+		}
+
+		# Student tracking
+		set package_id [ad_conn package_id]
+		set community_id [dotlrn_community::get_community_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]
+			lorsm::track::exit -track_id $track_id
+		}
+
+		# refresh the page every 300 seconds so we can have an estimate of the time when the user viewed the course for the last time
+		if { ![regsub -nocase {<\/head>} $text {
+			<meta http-equiv="refresh" content="300">
+			</head> 
+		} text] } {
+			regsub -nocase {<html>} $text {
+				<html>
+				<head>
+				<meta http-equiv="refresh" content="300">
+				</head> 
+			} text
+		}
+	}
+
+}
+
+ad_return_template
Index: openacs-4/packages/lorsm/www/course-add-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/Attic/course-add-2.tcl,v
diff -u -N -r1.4.2.2 -r1.4.2.3
--- openacs-4/packages/lorsm/www/course-add-2.tcl	26 Apr 2005 16:49:12 -0000	1.4.2.2
+++ openacs-4/packages/lorsm/www/course-add-2.tcl	27 May 2005 15:16:23 -0000	1.4.2.3
@@ -340,6 +340,13 @@
   -label "[_ lorsm.Course_Name]" -datatype text -widget text -help_text "[_ lorsm.lt_This_is_the_name_the_]" \
   -maxlength 200
 
+template::element create course_upload format_id  \
+	-label "[_ lorsm.lt_Course_Presentation_S]" -datatype text -widget select -options [db_list_of_lists select_formats_for_select_widget {select format_pretty_name,
+				format_id
+				from lorsm_course_presentation_formats
+				order by format_pretty_name}] \
+	-help_text "[_ lorsm.lt_Use_the_Classic_Style]" -value [db_string default_format {select format_id from lorsm_course_presentation_formats where format_name = 'default'}]
+
 template::element create course_upload course_id  \
   -label "[_ lorsm.course_id]" -datatype integer -widget hidden 
 
Index: openacs-4/packages/lorsm/www/course-add-3.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/Attic/course-add-3.tcl,v
diff -u -N -r1.6.2.3 -r1.6.2.4
--- openacs-4/packages/lorsm/www/course-add-3.tcl	26 Apr 2005 16:49:12 -0000	1.6.2.3
+++ openacs-4/packages/lorsm/www/course-add-3.tcl	27 May 2005 15:16:23 -0000	1.6.2.4
@@ -13,6 +13,7 @@
     @cvs-id $Id$
 } {
     folder_id:integer,notnull
+    format_id:integer,notnull
     tmp_dir:optional,notnull
     course_id:integer,notnull
     course_name:notnull
@@ -289,6 +290,7 @@
 			-version $man_version \
 			-orgs_default $man_orgs_default \
 			-hasmetadata $man_hasmetadata \
+			-course_presentation_format $format_id \
 			-isscorm $man_isscorm \
 			-folder_id $new_parent_id \
                         -fs_package_id $fs_package_id \
Index: openacs-4/packages/lorsm/www/course-structure.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/Attic/course-structure.adp,v
diff -u -N -r1.4.2.1 -r1.4.2.2
--- openacs-4/packages/lorsm/www/course-structure.adp	5 Jan 2005 17:01:51 -0000	1.4.2.1
+++ openacs-4/packages/lorsm/www/course-structure.adp	27 May 2005 15:16:23 -0000	1.4.2.2
@@ -144,6 +144,17 @@
                      </div>
               </td>
           </tr>
+              <tr class="list-odd last">
+              <td class="list" valign="top" style="background-color: #e0e0e0; font-weight: bold;">
+                #lorsm.Course#
+              </td>
+              <td class="list" valign="top" style="background-color: #f0f0f0">
+                 <b>@format_pretty_name@</b>
+                 <div style="float: right;">
+	             <a href="@formater_url@" class="button">#lorsm.Change#</a>
+                 </div>
+              </td>
+          </tr>
     <tr class="list-header">
         <th class="list" valign="top" style="background-color: #e0e0e0; font-weight: bold;" colspan="2">
          #lorsm.Organizations#
Index: openacs-4/packages/lorsm/www/course-structure.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/Attic/course-structure.tcl,v
diff -u -N -r1.4.2.2 -r1.4.2.3
--- openacs-4/packages/lorsm/www/course-structure.tcl	11 Jan 2005 18:31:33 -0000	1.4.2.2
+++ openacs-4/packages/lorsm/www/course-structure.tcl	27 May 2005 15:16:23 -0000	1.4.2.3
@@ -56,15 +56,17 @@
 	   acs.creation_date,
 	   acs.context_id,
            cpmc.isenabled,
+           pf.format_pretty_name,
            cpmc.istrackable
     from
-           ims_cp_manifests cp, acs_objects acs, ims_cp_manifest_class cpmc
+           ims_cp_manifests cp, acs_objects acs, ims_cp_manifest_class cpmc, lorsm_course_presentation_formats pf
     where 
            cp.man_id = acs.object_id
 	   and  cp.man_id = :man_id
            and  cp.man_id = cpmc.man_id
            and  cpmc.lorsm_instance_id = :package_id
-           and  cp.parent_man_id = 0"]} {
+           and  cp.parent_man_id = 0
+           and  cp.course_presentation_format = pf.format_id"]} {
 
     # Sets the variable for display. 
     set display 1
@@ -228,4 +230,5 @@
 set enabler_url [export_vars -base enabler {man_id}]
 set tracker_url [export_vars -base tracker {man_id}]
 set sharer_url  [export_vars -base sharer {man_id folder_id return_url}]
+set formater_url  [export_vars -base formater {man_id return_url}]
 
Index: openacs-4/packages/lorsm/www/formater.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/Attic/formater.adp,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/lorsm/www/formater.adp	27 May 2005 15:16:23 -0000	1.1.4.2
@@ -0,0 +1,5 @@
+<master>
+  <property name="title">@title@</property>
+  <property name="context">@context@</property>
+
+  <formtemplate id="formater"></formtemplate>
Index: openacs-4/packages/lorsm/www/formater.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/Attic/formater.tcl,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/lorsm/www/formater.tcl	27 May 2005 15:16:23 -0000	1.2.4.2
@@ -0,0 +1,71 @@
+# packages/lorsm/www/formater.tcl
+
+ad_page_contract {
+    
+    Change course format presentation
+    
+    @author jopezku@gmail.com
+    @cvs-id $Id: formater.tcl,v 1.2.4.2 2005/05/27 15:16:23 josee Exp $
+} {
+    man_id:integer
+    return_url
+} -properties {
+} -validate {
+} -errors {
+}
+
+set user_id [ad_conn user_id]
+set community_id [dotlrn_community::get_community_id]
+
+# check admin permisssion for the community
+set admin_p [dotlrn::user_can_admin_community_p  \
+				 -user_id $user_id  \
+		 -community_id $community_id ]
+
+# Permissions
+dotlrn::require_user_admin_community -user_id $user_id -community_id $community_id
+
+# check write permisssion for the learning object/manifest
+permission::require_write_permission -object_id $man_id -creation_user $user_id
+
+
+set title "[_ lorsm.lt_Set_Course_Presentati]"
+set context [list "[_ lorsm.lt_Set_Course_Presentati]"]
+
+ad_form -name formater \
+    -export {return_url} \
+    -form {
+		{man_id:key}
+		{project:text(inform)
+			{label "[_ lorsm.Course_Name]"}
+			{value {[lorsm::get_course_name -manifest_id $man_id]}}
+		}
+		{format_pretty_name:text(inform)
+			{label "[_ lorsm.Current_Format]"}
+		}
+		{format:text(select)
+			{label "[_ lorsm.Format_1]"}
+			{options {[db_list_of_lists select_formats_for_select_widget {select format_pretty_name,
+				format_id
+				from lorsm_course_presentation_formats
+				order by format_pretty_name}]}}
+		}
+	} -select_query {
+		select cp.course_presentation_format as format, pf.format_pretty_name
+		from ims_cp_manifests cp, lorsm_course_presentation_formats pf
+		where cp.man_id = :man_id
+		and cp.course_presentation_format = pf.format_id
+	} -edit_data {
+		db_transaction {
+			db_dml do_update {
+				update ims_cp_manifests
+				set course_presentation_format = :format
+				where man_id = :man_id }
+		}	
+	} -after_submit {
+		ad_returnredirect $return_url
+	}
+
+
+
+
Index: openacs-4/packages/lorsm/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/index.tcl,v
diff -u -N -r1.4.2.1 -r1.4.2.2
--- openacs-4/packages/lorsm/www/index.tcl	5 Jan 2005 17:01:51 -0000	1.4.2.1
+++ openacs-4/packages/lorsm/www/index.tcl	27 May 2005 15:16:23 -0000	1.4.2.2
@@ -46,8 +46,8 @@
     -elements {
         course_name {
             label "[_ lorsm.Available_Courses]"
+	    display_template {@d_courses.course_url;noquote@}
             display_col course_name
-            link_url_eval {delivery/?[export_vars man_id]}
             link_html {title "[_ lorsm.Access_Course]"}
 
         }
@@ -97,7 +97,7 @@
     }
 
 
-db_multirow -extend { ims_md_id } d_courses select_d_courses {
+db_multirow -extend { ims_md_id course_url } d_courses select_d_courses {
     select 
            cp.man_id,
            cp.course_name,
@@ -115,6 +115,8 @@
            cp.folder_id,
 	   acs.creation_user,
 	   acs.creation_date,
+           pf.folder_name,
+           pf.format_name,
 	   acs.context_id,
            case
               when cpmc.isenabled = 't' then 'Enabled'
@@ -126,15 +128,22 @@
            end as istrackable
               
     from
-           ims_cp_manifests cp, acs_objects acs, ims_cp_manifest_class cpmc
+           ims_cp_manifests cp, acs_objects acs, ims_cp_manifest_class cpmc, lorsm_course_presentation_formats pf
     where 
            cp.man_id = acs.object_id
     and
            cp.man_id = cpmc.man_id
     and
            cpmc.community_id = :community_id
+    and 
+           cp.course_presentation_format = pf.format_id
     order by acs.creation_date desc
 } {
     set ims_md_id $man_id
+    if { [string eq $format_name "default"] } { 
+	set course_url "<a href=\"${folder_name}/?[export_vars man_id]\" title=\"[_ lorsm.Access_Course]\">$course_name</a>"
+    } else {
+	set course_url "<a href=\"${folder_name}/?[export_vars man_id]\" title=\"[_ lorsm.Access_Course]\" target=_blank>$course_name</a>"
+    }
 }
  
Index: openacs-4/packages/lorsm/www/delivery-bottom-bar/body.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/delivery-bottom-bar/body.adp,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/lorsm/www/delivery-bottom-bar/body.adp	27 May 2005 15:16:23 -0000	1.1.2.2
@@ -0,0 +1,18 @@
+<master  src="/www/blank-master">
+<center>
+    
+<h1>#lorsm.Welcome_to# <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>
+    </if>
+ 	<else>
+	<a href="record-view?man_id=@man_id@&item_id=@first_item_id@" onclick="parent.frames['bottom'].location.reload()">#lorsm.Start#</a>
+	</else>
+
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 -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/lorsm/www/delivery-bottom-bar/body.tcl	27 May 2005 15:16:23 -0000	1.1.2.2
@@ -0,0 +1,76 @@
+# packages/lorsm/www/delivery-bottom-bar/body.tcl
+
+ad_page_contract {
+    
+} {
+    man_id:notnull
+} -properties {
+} -validate {
+} -errors {
+}
+
+set user_id [ad_conn user_id]
+set community_id [dotlrn_community::get_community_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
+}
+
+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"]} {
+    
+    # Course Name
+    if {[empty_string_p $course_name]} {
+	set course_name "[_ lorsm.No_Course_Name]"
+    } 
+} else {
+    set course_name "[_ lorsm.No_Course_Name]"
+}
+
+if { !$viewed_item_count } {
+	set first_item_id [lindex [lorsm::get_item_list $man_id $user_id] 0]
+}
Index: openacs-4/packages/lorsm/www/delivery-bottom-bar/bottom.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/delivery-bottom-bar/bottom.adp,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/lorsm/www/delivery-bottom-bar/bottom.adp	27 May 2005 15:16:23 -0000	1.1.2.2
@@ -0,0 +1,16 @@
+<html>
+<head>
+
+<style type="text/css">
+body {	text-align: right;
+	background-color: #A6E8B8}
+</style>
+</head>
+
+@prev_url;noquote@
+@next_url;noquote@
+@first_item_url;noquote@
+<a href="exit?man_id=@man_id@&track_id=@track_id@&return_url=@return_url@" target="_top"><img src="Images/exit.png" border="0" title="exit"></a>
+
+</body>
+</html>
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 -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/lorsm/www/delivery-bottom-bar/bottom.tcl	27 May 2005 15:16:23 -0000	1.1.2.2
@@ -0,0 +1,69 @@
+# packages/lorsm/www/delivery-bottom-bar/bottom.tcl
+
+ad_page_contract {
+    
+} {
+	man_id:integer,notnull
+	{item_id:integer ""}
+} -properties {
+} -validate {
+} -errors {
+}
+
+# Student tracking
+set package_id [ad_conn package_id]
+set community_id [dotlrn_community::get_community_id]
+set user_id [ad_conn user_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]
+} else {
+    set track_id 0
+}
+
+# return_url
+set return_url [dotlrn_community::get_community_url [dotlrn_community::get_community_id]]
+
+set item_list [lorsm::get_item_list $man_id $user_id]
+
+set last_item_viewed [db_string select_last_item_viewed {    
+	select 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 i.org_id = o.org_id
+	and o.man_id = :man_id
+	order by v.last_viewed desc
+		limit 1
+} -default "no_item"]
+
+set first_item_id [lindex $item_list 0]
+set first_item_url "<a href=\"[export_vars -base "record-view" -url {{item_id $first_item_id} man_id}]\" target=\"content\"><img src=\"Images/home.png\" border=\"0\" title=\"home\" onclick=\"window.location.reload()\"></a>"
+
+set curr_index [expr [lsearch -exact $item_list $last_item_viewed]]
+
+set prev_item_id [lindex $item_list [expr $curr_index - 1]]
+set next_item_id [lindex $item_list [expr $curr_index + 1]]
+
+set prev_url "<a href=\"[export_vars -base "record-view" -url {{item_id $prev_item_id} man_id}]\" target=\"content\"><img src=\"Images/prev.png\" border=\"0\" title=\"next\" onclick=\"window.location.reload()\"></a>"
+set next_url "<a href=\"[export_vars -base "record-view" -url {{item_id $next_item_id} man_id}]\" target=\"content\"><img src=\"Images/next.png\" border=\"0\" title=\"next\" onclick=\"window.location.reload()\"></a>"
+
+if { [string eq $last_item_viewed "no_item"] } {
+	# first time accessing the course
+	set next_url "<img src=\"Images/nexthide.png\" border=\"0\">"
+	set prev_url "<img src=\"Images/prevhide.png\" border=\"0\">"
+} elseif { ![expr [llength $item_list] - $curr_index - 1] }  {	
+	# last item
+	set next_url "<img src=\"Images/nexthide.png\" border=\"0\">"
+} elseif { ![expr $curr_index] } {
+	# first item
+	set prev_url "<img src=\"Images/prevhide.png\" border=\"0\">"
+}
+
+
Index: openacs-4/packages/lorsm/www/delivery-bottom-bar/exit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/delivery-bottom-bar/exit.tcl,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/lorsm/www/delivery-bottom-bar/exit.tcl	27 May 2005 15:16:23 -0000	1.1.2.2
@@ -0,0 +1,26 @@
+# packages/lorsm/www/delivery-bottom-bar/exit.tcl
+
+ad_page_contract {
+    
+    Student tracking exit
+    
+    @author Ernie Ghiglione (ErnieG@mm.st)
+    @creation-date 2004-05-25
+    @arch-tag 04aa013e-2a53-45eb-825d-d576ea35cd14
+    @cvs-id $Id: exit.tcl,v 1.1.2.2 2005/05/27 15:16:23 josee Exp $
+} {
+    track_id:integer
+    return_url
+} -properties {
+} -validate {
+} -errors {
+}
+
+# stamps the time when leaving the delivery environment
+
+if {$track_id != 0} {
+    lorsm::track::exit -track_id $track_id
+}
+
+# redirects
+ad_returnredirect $return_url
Index: openacs-4/packages/lorsm/www/delivery-bottom-bar/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/delivery-bottom-bar/index.adp,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/lorsm/www/delivery-bottom-bar/index.adp	27 May 2005 15:16:23 -0000	1.1.2.2
@@ -0,0 +1,8 @@
+<html>
+<head>
+<title>@course_name@</title>
+
+<frameset rows="90%,*" border=0>
+<frame src="<if @ims_id@ defined>@body_url;noquote@</if><else>body?man_id=@man_id@</else>" name="content">
+<frame src="bottom?man_id=@man_id@" name="bottom">
+</frameset>
Index: openacs-4/packages/lorsm/www/delivery-bottom-bar/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/delivery-bottom-bar/index.tcl,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/lorsm/www/delivery-bottom-bar/index.tcl	27 May 2005 15:16:23 -0000	1.1.2.2
@@ -0,0 +1,39 @@
+# packages/lorsm/www/delivery-bottom-bar/index.tcl
+
+ad_page_contract {
+    
+    New index file using new tree menu
+    
+    @author Roel Canicula (roelmc@info.com.ph)
+    @creation-date 2004-08-07
+    @arch-tag: 64f3397b-4558-4298-a995-fc63e472f2a1
+    @cvs-id $Id: index.tcl,v 1.1.2.2 2005/05/27 15:16:23 josee Exp $
+} {
+    man_id:integer,notnull
+} -properties {
+} -validate {
+} -errors {
+}
+
+set user_id [ad_conn user_id]
+set community_id [dotlrn_community::get_community_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"]} {
+    
+    # Course Name
+    if {[empty_string_p $course_name]} {
+	set course_name "[_ lorsm.No_Course_Name]"
+    } 
+} else {
+    set course_name "[_ lorsm.No_Course_Name]"
+}
+
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 -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/lorsm/www/delivery-bottom-bar/record-view.tcl	27 May 2005 15:16:23 -0000	1.1.2.2
@@ -0,0 +1,86 @@
+# packages/lorsm/www/delivery-bottom-bar/record-view.tcl
+
+ad_page_contract {
+    
+    records a view for this ims_cp_item and redirects to its url
+    
+    @author Deds Castillo (deds@i-manila.com.ph)
+    @author Ernie Ghiglione (ErnieG@mm.st)
+    @creation-date 2004-07-04
+    @arch-tag: a7aba567-c4c1-4f1c-b5f3-ebc1ab277515
+    @cvs-id $Id: record-view.tcl,v 1.1.2.2 2005/05/27 15:16:23 josee Exp $
+} {
+    item_id:notnull
+    man_id:notnull
+} -properties {
+} -validate {
+} -errors {
+}
+
+
+set viewer_id [ad_conn user_id]
+
+set views [views::record_view -object_id $item_id -viewer_id $viewer_id]
+
+lorsm::record_view $item_id $man_id
+
+set revision_id [item::get_best_revision $item_id]
+
+db_1row manifest_info "select fs_package_id, folder_id from ims_cp_manifests where man_id = :man_id"
+set content_root [fs::get_root_folder -package_id $fs_package_id]
+
+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 ""]
+
+db_1row item_info "select title from ims_cp_items where item_id = :item_id"
+
+set fs_item_id [fs::get_item_id -folder_id $folder_id -name $href]
+
+# If no fs_item_id, this item is probably a folder
+# Else deliver the page
+if { ![empty_string_p $fs_item_id] } {
+
+    set fs_revision_id [item::get_best_revision $fs_item_id]
+    set fs_item_mime [item::get_mime_info $fs_revision_id mime_info]
+
+
+    if { ![string equal -length 4 "text" $mime_info(mime_type)] } {
+
+	# It's a file.
+	cr_write_content -revision_id $fs_revision_id
+	ad_script_abort
+
+    } else {
+	
+	set href $url2$href
+	regsub -all {//} $href {/} href
+	set imsitem_id $item_id
+
+	#    lorsm::set_content_root content_root
+	lorsm::set_ims_item_id $item_id
+
+	# we use nsv variables to set the delivery environment this is a
+	# temporary solution until we find something a bit better
+
+	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
+	ad_returnredirect [export_vars -base view/$href {item_id} ]
+    }
+} else {
+    lorsm::set_ims_item_id $item_id
+    
+    # We have no content, so wipe item_id from the lorsm namespace
+    # This fixes a strange bug if you click a 'no content' menu item
+    # repeatedly and different content appears!
+    if { [info exists lorsm::item_id] } {
+	set lorsm::item_id ""
+    }
+
+    rp_internal_redirect -absolute_path [acs_root_dir]/templates/lorsm-default
+}
Index: openacs-4/packages/lorsm/www/delivery-bottom-bar/Images/exit.png
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/delivery-bottom-bar/Images/exit.png,v
diff -u -N -r1.1.2.1 -r1.1.2.2
Binary files differ
Index: openacs-4/packages/lorsm/www/delivery-bottom-bar/Images/home.png
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/delivery-bottom-bar/Images/home.png,v
diff -u -N -r1.1.2.1 -r1.1.2.2
Binary files differ
Index: openacs-4/packages/lorsm/www/delivery-bottom-bar/Images/leaf.gif
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/delivery-bottom-bar/Images/leaf.gif,v
diff -u -N -r1.1.2.1 -r1.1.2.2
Binary files differ
Index: openacs-4/packages/lorsm/www/delivery-bottom-bar/Images/minus.gif
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/delivery-bottom-bar/Images/minus.gif,v
diff -u -N -r1.1.2.1 -r1.1.2.2
Binary files differ
Index: openacs-4/packages/lorsm/www/delivery-bottom-bar/Images/next.png
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/delivery-bottom-bar/Images/next.png,v
diff -u -N -r1.1.2.1 -r1.1.2.2
Binary files differ
Index: openacs-4/packages/lorsm/www/delivery-bottom-bar/Images/nexthide.png
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/delivery-bottom-bar/Images/nexthide.png,v
diff -u -N -r1.1.2.1 -r1.1.2.2
Binary files differ
Index: openacs-4/packages/lorsm/www/delivery-bottom-bar/Images/plus.gif
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/delivery-bottom-bar/Images/plus.gif,v
diff -u -N -r1.1.2.1 -r1.1.2.2
Binary files differ
Index: openacs-4/packages/lorsm/www/delivery-bottom-bar/Images/prev.png
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/delivery-bottom-bar/Images/prev.png,v
diff -u -N -r1.1.2.1 -r1.1.2.2
Binary files differ
Index: openacs-4/packages/lorsm/www/delivery-bottom-bar/Images/prevhide.png
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/delivery-bottom-bar/Images/prevhide.png,v
diff -u -N -r1.1.2.1 -r1.1.2.2
Binary files differ
Index: openacs-4/packages/lorsm/www/delivery-bottom-bar/view/index-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/delivery-bottom-bar/view/index-oracle.xql,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/lorsm/www/delivery-bottom-bar/view/index-oracle.xql	27 May 2005 15:16:24 -0000	1.1.2.2
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+
+<queryset>
+   <rdbms><type>oracle</type><version>8.1.6</version></rdbms>
+
+<fullquery name="template_root">      
+      <querytext>
+
+      select content_template.get_root_folder from dual
+
+      </querytext>
+</fullquery>
+
+ 
+</queryset>
Index: openacs-4/packages/lorsm/www/delivery-bottom-bar/view/index-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/delivery-bottom-bar/view/index-postgresql.xql,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/lorsm/www/delivery-bottom-bar/view/index-postgresql.xql	27 May 2005 15:16:24 -0000	1.1.2.2
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+
+<queryset>
+   <rdbms><type>postgresql</type><version>7.1</version></rdbms>
+
+<fullquery name="template_root">      
+      <querytext>
+
+      select content_template__get_root_folder()
+
+      </querytext>
+</fullquery>
+
+ 
+</queryset>
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 -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/lorsm/www/delivery-bottom-bar/view/index.vuh	27 May 2005 15:16:24 -0000	1.1.2.2
@@ -0,0 +1,51 @@
+#################################################
+ad_page_contract {
+   
+    @author Unknown
+    @creation-date Unknown
+    @cvs-id $Id: index.vuh,v 1.1.2.2 2005/05/27 15:16:24 josee Exp $
+} {    
+	{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
+}
+
+# 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 template_root [db_string template_root ""]
+
+# Serve the page
+
+# DRB: Note that content::init modifies the local variable the_root, which is treated
+# as though it's been passed by reference.   This requires that the redirect treat the
+# path as an absolute path within the filesystem.
+
+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
+
+} else {
+  # ns_returnnotfound
+  set page "[ad_header {Content Item Not Found}]"
+  append page "<h3>Content Item Not Found</h3>"
+  append page "The requested item is not available for viewing.  "
+  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
+}
+
Index: openacs-4/packages/lorsm/www/delivery-no-index/exit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/delivery-no-index/exit.tcl,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/lorsm/www/delivery-no-index/exit.tcl	27 May 2005 15:16:24 -0000	1.1.4.2
@@ -0,0 +1,26 @@
+# packages/lorsm/www/delivery/exit.tcl
+
+ad_page_contract {
+    
+    Student tracking exit
+    
+    @author Ernie Ghiglione (ErnieG@mm.st)
+    @creation-date 2004-05-25
+    @arch-tag 04aa013e-2a53-45eb-825d-d576ea35cd14
+    @cvs-id $Id: exit.tcl,v 1.1.4.2 2005/05/27 15:16:24 josee Exp $
+} {
+    track_id:integer
+    return_url
+} -properties {
+} -validate {
+} -errors {
+}
+
+# stamps the time when leaving the delivery environment
+
+if {$track_id != 0} {
+    lorsm::track::exit -track_id $track_id
+}
+
+# redirects
+ad_returnredirect $return_url
Index: openacs-4/packages/lorsm/www/delivery-no-index/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/delivery-no-index/index.adp,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/lorsm/www/delivery-no-index/index.adp	27 May 2005 15:16:24 -0000	1.2.4.2
@@ -0,0 +1,18 @@
+<master  src="/www/blank-master">
+<center>
+    
+<h1>#lorsm.Welcome_to# <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>
+    </if>
+ 	<else>
+	<a href="record-view?man_id=@man_id@&item_id=@first_item_id@">#lorsm.Start#</a>
+	</else>
+
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
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/lorsm/www/delivery-no-index/index.tcl	27 May 2005 15:16:24 -0000	1.4.2.2
@@ -0,0 +1,100 @@
+# packages/lorsm/www/delivery4/index.tcl
+
+ad_page_contract {
+    
+    New index file using new tree menu
+    
+    @author Roel Canicula (roelmc@info.com.ph)
+    @creation-date 2004-08-07
+    @arch-tag: 64f3397b-4558-4298-a995-fc63e472f2a1
+    @cvs-id $Id: index.tcl,v 1.4.2.2 2005/05/27 15:16:24 josee Exp $
+} {
+    man_id:integer,notnull
+} -properties {
+} -validate {
+} -errors {
+}
+
+set user_id [ad_conn user_id]
+set community_id [dotlrn_community::get_community_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"]} {
+    
+    # Course Name
+    if {[empty_string_p $course_name]} {
+	set course_name "[_ lorsm.No_Course_Name]"
+    } 
+} else {
+    set course_name "[_ lorsm.No_Course_Name]"
+}
+
+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
+}
+
+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"]} {
+    
+    # Course Name
+    if {[empty_string_p $course_name]} {
+	set course_name "[_ lorsm.No_Course_Name]"
+    } 
+} else {
+    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]
+}
Index: openacs-4/packages/lorsm/www/delivery-no-index/record-view.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/delivery-no-index/record-view.tcl,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/lorsm/www/delivery-no-index/record-view.tcl	27 May 2005 15:16:24 -0000	1.3.2.2
@@ -0,0 +1,85 @@
+# packages/lorsm/www/delivery4/record-view.tcl
+
+ad_page_contract {
+    
+    records a view for this ims_cp_item and redirects to its url
+    
+    @author Deds Castillo (deds@i-manila.com.ph)
+    @author Ernie Ghiglione (ErnieG@mm.st)
+    @creation-date 2004-07-04
+    @arch-tag: a7aba567-c4c1-4f1c-b5f3-ebc1ab277515
+    @cvs-id $Id: record-view.tcl,v 1.3.2.2 2005/05/27 15:16:24 josee Exp $
+} {
+    item_id:notnull
+    man_id:notnull
+} -properties {
+} -validate {
+} -errors {
+}
+
+
+set viewer_id [ad_conn user_id]
+
+set views [views::record_view -object_id $item_id -viewer_id $viewer_id]
+
+set revision_id [item::get_best_revision $item_id]
+
+db_1row manifest_info "select fs_package_id, folder_id from ims_cp_manifests where man_id = :man_id"
+set content_root [fs::get_root_folder -package_id $fs_package_id]
+
+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 ""]
+
+db_1row item_info "select title from ims_cp_items where item_id = :item_id"
+
+set fs_item_id [fs::get_item_id -folder_id $folder_id -name $href]
+
+# If no fs_item_id, this item is probably a folder
+# Else deliver the page
+if { ![empty_string_p $fs_item_id] } {
+
+    set fs_revision_id [item::get_best_revision $fs_item_id]
+    set fs_item_mime [item::get_mime_info $fs_revision_id mime_info]
+
+
+    if { ![string equal -length 4 "text" $mime_info(mime_type)] } {
+
+	# It's a file.
+	cr_write_content -revision_id $fs_revision_id
+	ad_script_abort
+
+    } else {
+	
+	set href $url2$href
+	regsub -all {//} $href {/} href
+	set imsitem_id $item_id
+
+	#    lorsm::set_content_root content_root
+	lorsm::set_ims_item_id $item_id
+
+	# we use nsv variables to set the delivery environment this is a
+	# temporary solution until we find something a bit better
+
+	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
+
+	ad_returnredirect [export_vars -base view/$href {imsitem_id} ]
+    }
+} else {
+    lorsm::set_ims_item_id $item_id
+    
+    # We have no content, so wipe item_id from the lorsm namespace
+    # This fixes a strange bug if you click a 'no content' menu item
+    # repeatedly and different content appears!
+    if { [info exists lorsm::item_id] } {
+	set lorsm::item_id ""
+    }
+
+    rp_internal_redirect -absolute_path [acs_root_dir]/templates/lorsm-default
+}
Index: openacs-4/packages/lorsm/www/delivery-no-index/view/index-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/delivery-no-index/view/index-oracle.xql,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/lorsm/www/delivery-no-index/view/index-oracle.xql	27 May 2005 15:16:24 -0000	1.1.4.2
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+
+<queryset>
+   <rdbms><type>oracle</type><version>8.1.6</version></rdbms>
+
+<fullquery name="template_root">      
+      <querytext>
+
+      select content_template.get_root_folder from dual
+
+      </querytext>
+</fullquery>
+
+ 
+</queryset>
Index: openacs-4/packages/lorsm/www/delivery-no-index/view/index-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/delivery-no-index/view/index-postgresql.xql,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/lorsm/www/delivery-no-index/view/index-postgresql.xql	27 May 2005 15:16:24 -0000	1.1.4.2
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+
+<queryset>
+   <rdbms><type>postgresql</type><version>7.1</version></rdbms>
+
+<fullquery name="template_root">      
+      <querytext>
+
+      select content_template__get_root_folder()
+
+      </querytext>
+</fullquery>
+
+ 
+</queryset>
Index: openacs-4/packages/lorsm/www/delivery-no-index/view/index.vuh
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/delivery-no-index/view/index.vuh,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/lorsm/www/delivery-no-index/view/index.vuh	27 May 2005 15:16:24 -0000	1.3.2.2
@@ -0,0 +1,46 @@
+#################################################
+ad_page_contract {
+   
+    @author Unknown
+    @creation-date Unknown
+    @cvs-id $Id: index.vuh,v 1.3.2.2 2005/05/27 15:16:24 josee Exp $
+} {    
+}
+
+# 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]]]
+}
+
+
+# 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 template_root [db_string template_root ""]
+
+# Serve the page
+
+# DRB: Note that content::init modifies the local variable the_root, which is treated
+# as though it's been passed by reference.   This requires that the redirect treat the
+# path as an absolute path within the filesystem.
+
+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-no-index
+
+} else {
+  # ns_returnnotfound
+  set page "[ad_header {Content Item Not Found}]"
+  append page "<h3>Content Item Not Found</h3>"
+  append page "The requested item is not available for viewing.  "
+  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
+}
+