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 -N -r1.5 -r1.6
--- openacs-4/packages/lorsm/catalog/lorsm.en_US.ISO-8859-1.xml	22 Apr 2005 11:14:23 -0000	1.5
+++ openacs-4/packages/lorsm/catalog/lorsm.en_US.ISO-8859-1.xml	17 May 2005 17:03:39 -0000	1.6
@@ -600,6 +600,7 @@
   <msg key="lt_Number_in_the_Catalog">Number in the Catalog i.e.: '1.3.1'</msg>
   <msg key="lt_Number_of_Organizatio">Number of Organizations:</msg>
   <msg key="lt_number_of_times_and_h">number of times and have covered</msg>
+  <msg key="lt_one_course_versions">One Course Versions</msg>
   <msg key="lt_Organizational_struct">Organizational structure of the resource</msg>
   <msg key="lt_Other_Platform_Requir">Other Platform Requirements:</msg>
   <msg key="lt_Preliminary_informati">Preliminary information</msg>
@@ -659,7 +660,7 @@
   <msg key="lt_Upload_an_IMSSCORM_Co">Upload an IMS/SCORM Content Package Course</msg>
   <msg key="lt_Upload_IMS_Content_Pa">Upload IMS Content Package</msg>
   <msg key="lt_Uploading_and_process">Uploading and processing your course, please wait ...</msg>
-  <msg key="lt_Use_the_Browse_button">Use the &quot;Browse...&quot; button to locate your file, then click &quot;Open&quot;</msg>
+  <msg key="lt_Use_the_Browse_button">Use the \&quot;Browse...\&quot; button to locate your file, then click \&quot;Open\&quot;</msg>
   <msg key="lt_Use_the_Classic_Style">Use the Classic Style if your course does not provide an index by itself and you want us to provide it. Otherwise use the Without LORSM Index Style.</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">Version of the Schema. i.e.: '1.2.1'</msg>
@@ -785,7 +786,6 @@
   <msg key="Size_1">Size</msg>
   <msg key="Source">Source:</msg>
   <msg key="Source_1">Source</msg>
-  <msg key="Start">Begin with the Course</msg>
   <msg key="Start_Course">Start Course</msg>
   <msg key="Status">Status:</msg>
   <msg key="Status_1">Status</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 -N -r1.2 -r1.3
--- openacs-4/packages/lorsm/catalog/lorsm.es_ES.ISO-8859-1.xml	24 Feb 2005 13:33:21 -0000	1.2
+++ openacs-4/packages/lorsm/catalog/lorsm.es_ES.ISO-8859-1.xml	17 May 2005 17:03:39 -0000	1.3
@@ -596,6 +596,7 @@
   <msg key="lt_Number_in_the_Catalog">N�mero en el Cat�logo, por ejemplo: '1.3.1'</msg>
   <msg key="lt_Number_of_Organizatio">N�mero de Organizaciones:</msg>
   <msg key="lt_number_of_times_and_h">N�mero de Veces que ha sido cubierto</msg>
+  <msg key="lt_one_course_versions">Versiones de un curso</msg>
   <msg key="lt_Organizational_struct">Estructura Organizacional del recurso</msg>
   <msg key="lt_Other_Platform_Requir">Otros Requerimientos de Plataforma</msg>
   <msg key="lt_Preliminary_informati">Informaci�n Preliminar</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 -N -r1.2 -r1.3
--- openacs-4/packages/lorsm/catalog/lorsm.es_GT.ISO-8859-1.xml	24 Feb 2005 13:33:21 -0000	1.2
+++ openacs-4/packages/lorsm/catalog/lorsm.es_GT.ISO-8859-1.xml	17 May 2005 17:03:39 -0000	1.3
@@ -596,6 +596,7 @@
   <msg key="lt_Number_in_the_Catalog">N�mero en el Cat�logo, por ejemplo: '1.3.1'</msg>
   <msg key="lt_Number_of_Organizatio">N�mero de Organizaciones:</msg>
   <msg key="lt_number_of_times_and_h">N�mero de Veces que ha sido cubierto</msg>
+  <msg key="lt_one_course_versions">Versiones de un curso</msg>
   <msg key="lt_Organizational_struct">Estructura Organizacional del recurso</msg>
   <msg key="lt_Other_Platform_Requir">Otros Requerimientos de Plataforma</msg>
   <msg key="lt_Preliminary_informati">Informaci�n Preliminar</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 -N -r1.7 -r1.8
--- openacs-4/packages/lorsm/lib/user-lorsm.tcl	26 Apr 2005 08:56:23 -0000	1.7
+++ openacs-4/packages/lorsm/lib/user-lorsm.tcl	17 May 2005 17:03:39 -0000	1.8
@@ -1,4 +1,4 @@
-#packages/lorsm/www/test.tcl
+# packages/lorsm/www/test.tcl
 
 ad_page_contract {
     
@@ -15,24 +15,17 @@
 } -errors {
 }
 
-#set package_id $list_of_packages_ids
-
-#            link_url_eval {[site_node::get_url_from_object_id -object_id $lorsm_instance_id]${folder_name}/?[export_vars man_id]}
-#            link_html {title "[_ lorsm.Access_Course]" target "_blank"}
-
-	
 template::list::create \
     -name d_courses \
-    -pass_properties delivery_folder \
     -multirow d_courses \
     -html {width 100%} \
     -key man_id \
     -no_data "[_ lorsm.No_Courses]" \
     -elements {
         course_name {
             label "[_ lorsm.Course_Name_1]"
-			display_template {@d_courses.course_url;noquote@}
-			html { width 70% }
+	    display_template {@d_courses.course_url;noquote@}
+	    html { width 70% }
         }
         subject {
             label "[_ lorsm.Subject]"
@@ -54,76 +47,28 @@
     }
 
 set user_id [ad_conn user_id]
-
+set community_id [dotlrn_community::get_community_id]
+set extra_query ""
+if {![empty_string_p $community_id]} {
+    set extra_query "and cpmc.community_id = :community_id"
+}
 foreach package $package_id {
-
-    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,
-           cp.identifier,
-           cp.version,
-           cp.fs_package_id,
-           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, lorsm_course_presentation_formats pf
-	where 
-           cp.man_id = acs.object_id
-	and
-           cp.man_id = cpmc.man_id
-	and
---	   acs.context_id = :package
-           cpmc.lorsm_instance_id = :package
-	and
-           cpmc.isenabled = 't'
-	and
-		   cp.course_presentation_format = pf.format_id
-	order by acs.creation_date desc
-    } {
+    db_multirow -extend { ims_md_id last_viewed total_item_count viewed_item_count viewed_percent course_url } -append d_courses select_d_courses { } {
         set ims_md_id $man_id
-		if { [string eq $format_name "default"] } {
+	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 {
+	} 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 {
-            select v.last_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   
-        }]
+        db_0or1row get_last_viewed { }
+        set all_items [db_list get_total_items { }]
         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_items [db_list get_viewed_items { }]
         set viewed_item_count [llength $viewed_items]
         set viewed_percent [expr [expr $viewed_item_count * 1.00] / $total_item_count * 100]
-    
-	}
+    }
 }
+
+
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.5 -r1.6
--- openacs-4/packages/lorsm/tcl/lorsm-procs.tcl	21 Apr 2005 16:03:53 -0000	1.5
+++ openacs-4/packages/lorsm/tcl/lorsm-procs.tcl	17 May 2005 17:03:39 -0000	1.6
@@ -327,7 +327,7 @@
     variable ims_item_id $ims_it_id
 }
 
-ad_proc -public get_ims_item_id {} {
+ad_proc -public get_ims_item_id { } {
 
     variable ims_item_id
     return $ims_item_id
@@ -445,7 +445,7 @@
     
     upvar $urlvar url $rootvar root_path 
     
-    variable item_id
+    variable ims_item_id
     variable revision_id
     
     # if a .tcl file exists at this url, then don't do any queries
@@ -456,8 +456,8 @@
     # cache this query persistently for 1 hour
     # this is faster than 1 query because a pl/sql function in the
     # where clause is a very bad idea
-    db_0or1row get_item_id ""
 
+    db_0or1row get_item_id ""
     db_0or1row get_item_type ""
     # No item found, so do not handle this request
     if { ![info exists item_id] } { 
@@ -478,8 +478,8 @@
     
     # Make sure that a live revision exists
     if { [empty_string_p $rev_id] } {
-      set live_revision [db_string get_live_revision ""]
-	
+
+       set live_revision [db_string get_live_revision ""]
 	if { [template::util::is_nil live_revision] } {
 	    ns_log notice "content::init: no live revision found for content item $item_id"
 	    return 0
@@ -536,12 +536,15 @@
     variable revision_id
     variable ims_item_id
     variable ims_item_title
+  
 
+set item_id $ims_item_id
     if { [template::util::is_nil item_id] } {
-      ns_log warning "content::get_content: No active item in content::get_content"
+	ns_log warning "content::get_content: No active item in content::get_content"
 	return
     }
 
+
     # Get the live revision
     set revision_id [db_string get_revision ""]
 
@@ -570,7 +573,78 @@
 }
 
 
+}
 
+ad_proc -public lorsm::get_root_folder_id { } { } {
+    return [db_string get_root_folder { select folder_id from cr_folders where label = 'LORSM Root Folder' }]
+}    
+
+ad_proc -public lorsm::get_folder_id { 
+    -name:required
+} {
+    return [db_string get_root_folder { select folder_id from cr_folders where label = :name }]
+}    
+
+ad_proc -public lorsm::get_items_indent {
+   -org_id:required
+} {
+    Returns a list of the form \{ims_item_id indent\} from one org_id
+} {
+
+    # We need all the count of all items (just live revisions)
+    set items_count [db_string get_items_count { select count(ims_item_id)
+	from ims_cp_items where ims_item_id in ( select live_revision
+						 from cr_items where content_type = 'ims_item_object') and
+	org_id = :org_id
+    }]
+    
+    # Get the root items
+    set count 0
+    db_foreach get_root_item { select ims_item_id from ims_cp_items where parent_item = :org_id and org_id = :org_id } {
+	lappend items_list [list $ims_item_id 1]
+	set items_array($ims_item_id) 1
+	incr count
+    }
+
+    
+    while { $count < $items_count } {
+	foreach item $items_list {
+	    set item_id [lindex $item 0]
+	    set indent [expr [lindex $item 1] + 1]
+	    db_foreach get_items {select ims_item_id from ims_cp_items where parent_item = :item_id and org_id = :org_id } {
+		if { ![info exist items_array($ims_item_id)] } {
+		    lappend items_list [list $ims_item_id $indent]
+		    set items_array($ims_item_id) $indent
+		    incr count
+		}
+	    }
+	}
+    }
+    return $items_list
 }
+
+ad_proc -public lorsm::get_item_delivery_url {
+    -man_id:required
+    -item_id:required
+    -community_id
+} {
+     Get delivery URL
     
+    @author Dave Bauer (dave@thedesignexperience.org)
+    @creation-date 2005-03-30
+    
+    @param man_id
 
+    @param item_id
+
+    @return 
+    
+    @error 
+} {
+    set base_url ""
+    if {[exists_and_not_null community_id]} {
+        append base_url "FIXME"
+    }
+    set url [export_vars -base ${base_url}lorsm {man_id item_id}]
+    return $url
+}
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 -N -r1.1 -r1.2
--- openacs-4/packages/lorsm/tcl/lorsm-procs.xql	4 Sep 2004 14:51:20 -0000	1.1
+++ openacs-4/packages/lorsm/tcl/lorsm-procs.xql	17 May 2005 17:03:39 -0000	1.2
@@ -4,7 +4,7 @@
 <fullquery name="lorsm::get_content.get_revision">      
       <querytext>
 
-        select live_revision from cr_items where item_id = :item_id
+        select live_revision from cr_items where item_id = :ims_item_id
 
       </querytext>
 </fullquery>
@@ -64,7 +64,7 @@
 <fullquery name="lorsm::init.get_live_revision">      
       <querytext>
 
-    select live_revision from cr_items where item_id = :item_id
+    select live_revision from cr_items where item_id = :ims_item_id
 
       </querytext>
 </fullquery>
@@ -77,4 +77,10 @@
       </querytext>
 </fullquery>
 
-</queryset>
+<fullquery name="lorsm::get_root_folder_id.get_root_folder">      
+      <querytext>
+         select folder_id from cr_folders where label = 'LORSM Root Folder'
+      </querytext>
+</fullquery>
+
+</queryset>
\ No newline at end of file
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.3 -r1.4
--- openacs-4/packages/lorsm/templates/lorsm-default.adp	21 Apr 2005 16:03:53 -0000	1.3
+++ openacs-4/packages/lorsm/templates/lorsm-default.adp	17 May 2005 17:03:40 -0000	1.4
@@ -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,6 +22,9 @@
     <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>
@@ -35,11 +38,8 @@
     </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>
-</if>
-<else>
-@text;noquote@
-</else>
\ No newline at end of file
+  </if>
\ 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.6 -r1.7
--- openacs-4/packages/lorsm/templates/lorsm-default.tcl	26 Apr 2005 16:48:29 -0000	1.6
+++ openacs-4/packages/lorsm/templates/lorsm-default.tcl	17 May 2005 17:03:40 -0000	1.7
@@ -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)] || [string equal "text/xml" $content(mime_type) ]} {
+    } elseif { [string equal "text/css" $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,22 +19,17 @@
     # 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
 
@@ -53,7 +48,10 @@
     set write_p 0
 }
 
+
+
 if {![empty_string_p $imsitem_id]} {
+    set imsitem_id [content::item::get_live_revision -item_id $imsitem_id]
     # See if they have write and the object is browser editable to offer an edit link.
     set write_p [permission::write_permission_p -object_id $imsitem_id] 
     if { $write_p && [info exists content(item_id)] } {
@@ -65,23 +63,23 @@
 
     set package_id [ad_conn package_id]
     set package_url [apm_package_url_from_id $package_id]
+    set man_id [db_string get_man_id "select man_id from ims_cp_items i, ims_cp_organizations o where i.ims_item_id = :imsitem_id and i.org_id = o.org_id"]
 
-    set man_id [db_string man_id "select man_id from ims_cp_items i, ims_cp_organizations o where i.item_id = :imsitem_id and i.org_id = o.org_id"]
-    set folder_id [db_string man_id "select folder_id from ims_cp_manifests where man_id = :man_id"]
+    set folder_id [db_string get_folder__id "select folder_id from ims_cp_manifests where man_id = :man_id"]
 
     # We display children
-    db_1row item_info "select title, parent_item from ims_cp_items where item_id = :imsitem_id"
+    db_1row item_info "select item_title, parent_item from ims_cp_items where ims_item_id = :imsitem_id"
 
     # Selected fields are renamed to avoid conflict with existing variables
     db_multirow -extend {href} children children {
 	select 
-	  ims_cp_items.item_id as child_item_id, 
-	  ims_cp_items.title as child_title 
+	  ims_cp_items.ims_item_id as child_item_id, 
+	  ims_cp_items.item_title as child_title 
 	from 
 	  acs_objects,
 	  ims_cp_items
 	where 
-	  acs_objects.object_id = ims_cp_items.item_id and
+	  acs_objects.object_id = ims_cp_items.ims_item_id and
 	  parent_item = :imsitem_id
 	order by
 	  acs_objects.object_id,
@@ -137,14 +135,14 @@
 		      ims_cp_resources,
 		      ims_cp_items_to_resources
 		    where
-		      ims_cp_items.item_id = :parent_item and
-		      ims_cp_items.parent_item = ims_cp_items_to_resources.item_id and
+		      ims_cp_items.ims_item_id = :parent_item and
+		      ims_cp_items.parent_item = ims_cp_items_to_resources.ims_item_id and
 		      ims_cp_items_to_resources.res_id = ims_cp_resources.res_id
 		}
 	    }
 	}
 
-	if { [db_0or1row href "select href as parent_href from ims_cp_resources r, ims_cp_items_to_resources ir where ir.item_id = :parent_item and ir.res_id = r.res_id"] || [info exists grandparent_item] } {
+	if { [db_0or1row href "select href as parent_href from ims_cp_resources r, ims_cp_items_to_resources ir where ir.ims_item_id = :parent_item and ir.res_id = r.res_id"] || [info exists grandparent_item] } {
 	    # Let record-view render this page so the child items are
 	    # shown
 	    set parent_href ${package_url}delivery/record-view
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.8 -r1.9
--- openacs-4/packages/lorsm/www/course-add-3.tcl	26 Apr 2005 16:33:14 -0000	1.8
+++ openacs-4/packages/lorsm/www/course-add-3.tcl	17 May 2005 17:03:40 -0000	1.9
@@ -13,7 +13,7 @@
     @cvs-id $Id$
 } {
     folder_id:integer,notnull
-	format_id:integer,notnull
+    format_id:integer,notnull
     tmp_dir:optional,notnull
     course_id:integer,notnull
     course_name:notnull
@@ -87,14 +87,17 @@
 
         }
 
+	# We need to separate folders (since now all are cr_items) one for the files (content) and the other
+	# one for the created cr_items
         set new_parent_id [lors::cr::add_folder -parent_id $parent_id -folder_name $cr_dir]
+        set new_items_parent_id [lors::cr::add_folder -parent_id $parent_id -folder_name "${cr_dir}_items"]
 
-
 	# PERMISSIONS FOR FILE-STORAGE
 
         # Before we go about anything else, lets just set permissions straight.
          # Disable folder permissions inheritance
          permission::toggle_inherit -object_id $new_parent_id
+         permission::toggle_inherit -object_id $new_items_parent_id
 
 	# Set read permissions for community/class dotlrn_member_rel
 
@@ -105,6 +108,7 @@
 						      and rel_type = 'dotlrn_member_rel'}]
 
 	 permission::grant -party_id $party_id_member -object_id $new_parent_id -privilege read
+	 permission::grant -party_id $party_id_member -object_id $new_items_parent_id -privilege read
 
 	# Set read permissions for community/class dotlrn_admin_rel
 
@@ -113,6 +117,7 @@
 						     and rel_type = 'dotlrn_admin_rel'}]
 
 	permission::grant -party_id $party_id_admin -object_id $new_parent_id -privilege read
+	permission::grant -party_id $party_id_admin -object_id $new_items_parent_id -privilege read
 
 	# Set read permissions for *all* other professors  within .LRN
 	# (so they can see the content)
@@ -121,6 +126,7 @@
                                                      where rel_type = 'dotlrn_professor_profile_rel'}]
 
 	permission::grant -party_id $party_id_professor -object_id $new_parent_id -privilege read
+	permission::grant -party_id $party_id_professor -object_id $new_items_parent_id -privilege read
 
 	# Set read permissions for *all* other admins within .LRN
 	# (so they can see the content)
@@ -129,11 +135,10 @@
                                                      where rel_type = 'dotlrn_admin_profile_rel'}]
 
 	permission::grant -party_id $party_id_admins -object_id $new_parent_id -privilege read
+	permission::grant -party_id $party_id_admins -object_id $new_items_parent_id -privilege read
 
 
 
-
-
         set filesx [lors::cr::add_files -parent_id $new_parent_id -indb_p $indb_p -files [lors::cr::has_files -fs_dir $fs_dir]]
 
         set all_files [concat $all_files $filesx]
@@ -292,9 +297,10 @@
 			-hasmetadata $man_hasmetadata \
 			-course_presentation_format $format_id \
 			-isscorm $man_isscorm \
-			-folder_id $new_parent_id \
+			-folder_id $new_items_parent_id \
                         -fs_package_id $fs_package_id \
-		        -community_id $community_id]
+		        -community_id $community_id \
+		        -content_folder_id $new_parent_id]
 
 
 	ns_write "[_ lorsm.lt_Granting_permissions__1]<br>"
@@ -383,7 +389,8 @@
                                 -identifier $org_identifier \
                                 -structure $org_structure \
                                 -title $org_title \
-                                -hasmetadata $org_hasmetadata]
+                                -hasmetadata $org_hasmetadata\
+				-org_folder_id $new_items_parent_id]
 
 		ns_write "[_ lorsm.lt_Adding_Organization_o]<br>"
 
@@ -400,7 +407,7 @@
 
 #                ns_write "[_ lorsm.lt_here_is_list_items_li]"
 
-                set add [concat $add [lors::imscp::addItems -org_id $org_id $list_items 0 $tmp_dir]]
+                set add [concat $add [lors::imscp::addItems -itm_folder_id $new_items_parent_id -org_id $org_id $list_items 0 $tmp_dir]]
 
 		set tempval [llength $add]
 		ns_write "[_ lorsm.lt_Adding_tempval_items_]<br>"
@@ -441,14 +448,15 @@
 # 		}
 
 ## End integration showcase                
-
+		
                 set resource_id [lors::imscp::resource_add \
                                      -man_id $man_id \
                                      -identifier $res_identifier \
                                      -type $res_type \
                                      -href $res_href \
                                      -scorm_type $res_scormtype \
-                                     -hasmetadata $res_hasmetadata]
+                                     -hasmetadata $res_hasmetadata \
+				     -res_folder_id $new_items_parent_id]
 
 		ns_write "[_ lorsm.lt_Adding_resource_res_i_2]<br>"
 		
@@ -529,7 +537,6 @@
 
     ns_write "[_ lorsm.lt_Now_we_are_almost_don]<br>"
 
-
     foreach file $l_files {
 
         set filename [lindex $file 0]
@@ -544,6 +551,7 @@
 
 	if {![empty_string_p $found_file]} {
 	    set file_id [lindex [lindex $all_files $found_file] 3]
+            set file_rev_id [content::item::get_live_revision -item_id $file_id]
 	    set res_id  [lindex $file 1]
 	    set file_hasmetadata [lindex $file 2]
 
@@ -556,7 +564,7 @@
 	    }
 
 	    set fileadd [lors::imscp::file_add \
-			     -file_id $file_id \
+			     -file_id $file_rev_id \
 			     -res_id $res_id \
 			     -pathtofile $filename \
 			     -filename $filex \
Index: openacs-4/packages/lorsm/www/course-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/Attic/course-add.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/lorsm/www/course-add.tcl	3 Dec 2004 17:52:49 -0000	1.3
+++ openacs-4/packages/lorsm/www/course-add.tcl	17 May 2005 17:03:40 -0000	1.4
@@ -7,11 +7,16 @@
     @cvs-id $Id$
 
 } {
+    man_id:optional
 }
 
 set user_id [ad_conn user_id]
 set community_id [dotlrn_community::get_community_id]
 
+if { ![info exists man_id] } { 
+   set man_id ""
+}
+
 # Permissions
 dotlrn::require_user_admin_community -user_id $user_id -community_id $community_id
 
@@ -70,11 +75,17 @@
 template::element create course_upload upload_file  \
   -label "[_ lorsm.lt_Choose_the_course_zip]" -help_text "[_ lorsm.lt_Use_the_Browse_button]" -datatype text -widget file
 
+# To support course versions
+template::element create course_upload man_id  \
+  -datatype integer -widget hidden
+
 template::element set_properties course_upload course_id -value $course_id
 template::element set_properties course_upload folder_id -value $folder_id
 template::element set_properties course_upload indb_p -value $indb_p
 template::element set_properties course_upload fs_package_id -value $fs_package_id
+template::element set_properties course_upload man_id -value $man_id
 
+
 ad_return_template
 
 
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.5 -r1.6
--- openacs-4/packages/lorsm/www/course-structure.adp	21 Apr 2005 16:03:53 -0000	1.5
+++ openacs-4/packages/lorsm/www/course-structure.adp	17 May 2005 17:03:40 -0000	1.6
@@ -23,7 +23,12 @@
                 #lorsm.Version#
               </td>
               <td class="list" valign="top" style="background-color: #f0f0f0">
-                  @version;noquote@
+                  <if @version@ eq "0">
+                       @version_msg;noquote@
+                  </if>
+                  <else>
+                       @version;noquote@ Course Versions
+                  </else>
               </td>
           </tr>
               <tr class="list-odd">
@@ -32,7 +37,12 @@
               </td>
               <td class="list" valign="top" style="background-color: #f0f0f0">
          	<if @man_metadata@ eq "Yes">
-	           <a href="md/?ims_md_id=@man_id@">#lorsm.Yes#</a>
+                   <if @lorsm_p@>
+	              <a href="md/?ims_md_id=@man_id@">#lorsm.Yes#</a>
+                   </if>
+                   <else>
+                      #lorsm.Yes#
+                   </else>
                 </if>
 	        <else>
                   #lorsm.No#
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.6 -r1.7
--- openacs-4/packages/lorsm/www/course-structure.tcl	21 Apr 2005 16:03:53 -0000	1.6
+++ openacs-4/packages/lorsm/www/course-structure.tcl	17 May 2005 17:03:40 -0000	1.7
@@ -16,6 +16,7 @@
 }
 
 set package_id [ad_conn package_id]
+set community_id [dotlrn_community::get_community_id]
 
 ad_proc -public getFolderKey {
     {-object_id:required}
@@ -34,39 +35,7 @@
 set title "[_ lorsm.Course_Structure]"
 
 
-if {[db_0or1row manifest "
-    select 
-           cp.man_id,
-           cp.course_name,
-           cp.identifier,
-           cp.version,
-           text 'Yes' as hello,
-           case
-              when hasmetadata = 't' then 'Yes'
-              else 'No'
-           end as man_metadata,
-           case 
-              when isscorm = 't' then 'Yes'
-              else 'No'
-           end as isscorm,
-           cp.fs_package_id,
-           cp.folder_id,
-	   cp.isshared,
-	   acs.creation_user,
-	   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, 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.course_presentation_format = pf.format_id"]} {
+if {[db_0or1row manifest { }]} {
 
     # Sets the variable for display. 
     set display 1
@@ -77,32 +46,37 @@
     } 
 
     # Version
-    if {[empty_string_p $version]} {
-	set version "[_ lorsm.No_version_Available]"
+    set version [db_string get_versions { } -default 0]
+
+    if {[string equal $version "0"]} {
+	set version_msg "[_ lorsm.No_version_Available]"
     } 
     
-    # Instance
-    set instance [apm_package_key_from_id $fs_package_id]
+    if { ![empty_string_p $fs_package_id] } {
+	# Folder
+	set folder [apm_package_url_from_id $fs_package_id]?[export_vars folder_id]
+	# Instance
+	set instance [apm_package_key_from_id $fs_package_id]
+    } else {
+	set fs_package_id [site_node_apm_integration::get_child_package_id \
+			       -package_id [dotlrn_community::get_package_id $community_id] \
+			       -package_key "file-storage"]
+	# Instance
+	set instance [lors_central::get_course_name -man_id $man_id]
+	# Folder
+	set root_folder [lors_central::get_root_folder_id]
+	set folder_id [db_string get_folder_id { }]
+	set folder [apm_package_url_from_id $fs_package_id]?[export_vars folder_id]
+    }
 
-    # Folder
-    set folder [apm_package_url_from_id $fs_package_id]?[export_vars folder_id]
-
     # Created By
     set created_by [person::name -person_id $creation_user]
 
     # Creation Date
     set creation_date [lc_time_fmt $creation_date "%x %X"]
 
     # Check for submanifests
-    if {[db_0or1row submans "
-           select 
-                count(*) as submanifests 
-           from 
-                ims_cp_manifests 
-           where 
-                man_id = :man_id
-              and
-                parent_man_id = :man_id"]} {
+    if {[db_0or1row submans { }]} {
     } else {
 	set submanifests 0
     }
@@ -122,100 +96,37 @@
         <th class=\"list\" valign=\"top\" style=\"background-color: #e0e0e0; font-weight: bold;\">[_ lorsm.Items]</th>
     </tr>
 "
-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 organizations { } {
 
 
+    set total_items [db_string items_count {select count(*) from ims_cp_items where org_id=:org_id} -default 0]
+    # We get the indent of the items in this org_id
+    set indent_list [lors_central::get_items_indent -org_id $org_id]
+    template::util::list_of_lists_to_array $indent_list indent_array
+
+
     append orgs_list "<tr class=\"list-even\"><td valign=\"top\" width=\"20%\">$org_title</td><td valign=\"top\" align=\"center\" width=\"5%\">$hasmetadata</td><td>"
 
     set indent [expr $indent +1]
     set missing_text "[_ lorsm.Nothing_here]"
     set return_url [export_vars -base [ns_conn url] man_id]
     set table_extra_html { width="100%" }
-   
-    set table_extra_vars {return_url}
+    set table_extra_vars {return_url indent_array lorsm_p}
     set table_def {
-	{ title "[_ lorsm.Item_Name]" "no_sort" "<td>$indent[if {![empty_string_p $identifierref]} {set href \"<a href='[apm_package_url_from_id $fs_package_id]view/[db_string select_folder_key {select key from fs_folders where folder_id = :folder_id}]/[lorsm::fix_url -url $identifierref]'>$item_title</a>\"} else {set href $item_title}]</td>" }
-	{ Edit "[_ lorsm.Edit]" "no_sort" "<td align=\"center\">[if {![empty_string_p $identifierref]} {set href \"<a href=\'[export_vars -base edit-content {identifierref folder_id return_url fs_package_id}]\'>[_ lorsm.Edit_1]</a></td>\"}]"}
-	{ metadata "[_ lorsm.Metadata_1]" "no_sort" "<td align=\"center\">[if {$hasmetadata == \"f\"} {set hasmetadata \"<a href=md?ims_md_id=$item_id>No\"} else {set hasmetadata \"<a href=md/?ims_md_id=$item_id>Yes\"}]</a></td>" }
-	{ type   "[_ lorsm.Type]" "no_sort" "<td align=\"center\">$type</td>" }
-	{ shared "[_ lorsm.Is_Shared]" "no_sort" "<td align=\"center\">[if {$isshared == false} {set ret \"No\"}]</td>" }
+	{ title "\#lorsm.Item_Name\#" "no_sort" "<td>
+           [set indent  \"\"
+                      for { set i 0 } { $i < [expr $indent_array($item_id)-1]} { incr i } {
+                      append indent \"&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;\"
+                      }
+            if {![empty_string_p $identifierref]} {set href \"$indent<a href='[apm_package_url_from_id_mem $fs_package_id]view/[db_string select_folder_key {select key from fs_folders where folder_id = :folder_id}]/[lorsm::fix_url -url $identifierref]'>$item_title</a>\"} else {set href $item_title}]</td>" }
+	{ Edit "\#lorsm.Edit\#" "no_sort" "<td align=\"center\">[if {![empty_string_p $identifierref]} { if { $lorsm_p } { set href \"<a href=\'[export_vars -base edit-content {identifierref folder_id return_url fs_package_id}]\'>[_ lorsm.Edit_1]</a></td>\"} else { set href \"Edit\" }}]"}
+	{ metadata "\#lorsm.Metadata_1\#" "no_sort" "<td align=\"center\">[if {$hasmetadata == \"f\"} { if { $lorsm_p } { set hasmetadata \"<a href=md?ims_md_id=$item_id>No\"}  else { set hasmetadata \"No\"} } else { if { $lorsm_p } { set hasmetadata \"<a href=md/?ims_md_id=$item_id>Yes\"} else { set hasmetadata \"Yes\"}}]</a></td>" }
+	{ type   "\#lorsm.Type\#" "no_sort" "<td align=\"center\">$type</td>" }
+	{ shared "\#lorsm.Is_Shared\#" "no_sort" "<td align=\"center\">[if {$isshared == false} {set ret \"No\"}]</td>" }
     }
 
-    set table_item [ad_table -Tmissing_text $missing_text -Textra_vars $table_extra_vars -Theader_row_extra "style=\"background-color: #e0e0e0; font-weight: bold;\" class=\"list-header\"" -Ttable_extra_html $table_extra_html blah {
-        SELECT
-		o.object_id,
- 		repeat('&nbsp;', (tree_level(tree_sortkey) - :indent)* 3) as indent,
-		i.item_id,
-                i.title as item_title,
-                i.hasmetadata,
-                i.org_id,
-                case
-                    when i.isshared = 'f' then (
-						'false'
-						) 
-	            else 'true'
-                end as isshared,
-                case 
-		    when i.identifierref <> '' then (
-						     SELECT
-						      res.href 
-						     FROM
-						      ims_cp_items_to_resources i2r, 
-						      ims_cp_resources res 
-						     WHERE
-						       i2r.res_id = res.res_id
-						      AND
-						       i2r.item_id = i.item_id 
-)
-                  else ''
-                end as identifierref,
-                case 
-		    when i.identifierref <> '' then (
-						     SELECT
-						      res.type
-						     FROM
-						      ims_cp_items_to_resources i2r, 
-						      ims_cp_resources res 
-						     WHERE
-						       i2r.res_id = res.res_id
-						      AND
-						       i2r.item_id = i.item_id 
-)
-                  else ''
-                end as type,
-                m.fs_package_id,
-	        m.folder_id,
-	        m.course_name
-        FROM 
-		acs_objects o, ims_cp_items i, ims_cp_manifests m
-	WHERE 
-		o.object_type = 'ims_item'
-           AND
-		i.org_id = :org_id
-	   AND
-		o.object_id = i.item_id
-           AND
-                m.man_id = :man_id
-        ORDER BY 
-                tree_sortkey, object_id
+    set table_item [ad_table -Tmissing_text $missing_text -Textra_vars $table_extra_vars -Theader_row_extra "style=\"background-color: #e0e0e0; font-weight: bold;\" class=\"list-header\"" -Ttable_extra_html $table_extra_html blah { } $table_def]
 
-
-    } $table_def]
-
     append orgs_list "$table_item"
 
 
@@ -231,4 +142,3 @@
 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/edit-content.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/edit-content.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/lorsm/www/edit-content.tcl	3 Dec 2004 17:52:49 -0000	1.2
+++ openacs-4/packages/lorsm/www/edit-content.tcl	17 May 2005 17:03:40 -0000	1.3
@@ -33,9 +33,8 @@
 # get rid of it
 regsub -all {//} $pather {/} pather
 
+set file_id [content::item::get_id -item_path $pather -root_folder_id $fs_root_folder]
 
-set file_id [db_string sql {select content_item__get_id(:pather, :fs_root_folder, 'f')}]
-
 # check for permissions
 # By default, only the creator has admin access to content
 
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.6 -r1.7
--- openacs-4/packages/lorsm/www/index.tcl	26 Apr 2005 08:56:24 -0000	1.6
+++ openacs-4/packages/lorsm/www/index.tcl	17 May 2005 17:03:40 -0000	1.7
@@ -46,14 +46,21 @@
     -elements {
         course_name {
             label "[_ lorsm.Available_Courses]"
-			display_template {@d_courses.course_url;noquote@}
+	    display_template {@d_courses.course_url;noquote@}
             display_col course_name
         }
         hasmetadata {
             label "[_ lorsm.Metadata_1]"
-            link_url_eval {md/?[export_vars ims_md_id]}
-            link_html {title "[_ lorsm.See_metadata]" }
-	    html { align center }
+            display_template {
+		<if @d_courses.lorsm_p@>
+		<center>
+                  <a href=md/?ims_md_id=@d_courses.ims_md_id@ title="[_ lorsm.See_metadata]">@d_courses.hasmetadata@</a>
+                </center>
+                </if>
+                <else>
+		   <center> @d_courses.hasmetadata@</center>
+                </else>
+	    }
         }
         isscorm {
             label "[_ lorsm.SCORM]"
@@ -80,10 +87,13 @@
         }
         export {
             label "[_ lorsm.Export]"
-	    display_eval {\[zip\]}
-            link_url_eval {[export_vars -base export folder_id]}
-            link_html {title "[_ lorsm.lt_Export_as_IMS_Content]"}
-	    html { align center }
+	    display_template {
+		<if @d_courses.lorsm_p@>
+		<center>
+		<a href="export/?folder_id=@d_courses.folder_id@" title="[_ lorsm.lt_Export_as_IMS_Content]">\[zip\]</a>
+		</center>
+                </if>
+	    }
         }
         admin {
             label "[_ lorsm.Admin_Course]"
@@ -110,11 +120,14 @@
               else 'No'
            end as isscorm,
            cp.fs_package_id,
+           case when fs_package_id is null then 'f'
+              else 't'
+           end as lorsm_p,
            cp.folder_id,
 	   acs.creation_user,
 	   acs.creation_date,
-	   pf.folder_name,
-	   pf.format_name,
+           pf.folder_name,
+           pf.format_name,
 	   acs.context_id,
            case
               when cpmc.isenabled = 't' then 'Enabled'
@@ -133,15 +146,18 @@
            cp.man_id = cpmc.man_id
     and
            cpmc.community_id = :community_id
-	and
-	       cp.course_presentation_format = pf.format_id
+    and 
+           cp.course_presentation_format = pf.format_id
+    and    
+           cp.man_id in (select cr.live_revision
+                         from cr_items cr where content_type = 'ims_manifest_object')
     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>" 
-	}
+    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/body.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/delivery/body.tcl,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/lorsm/www/delivery/body.tcl	24 Feb 2005 13:33:22 -0000	1.4
+++ openacs-4/packages/lorsm/www/delivery/body.tcl	17 May 2005 17:03:40 -0000	1.5
@@ -18,20 +18,20 @@
 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
+    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/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/delivery/index.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/lorsm/www/delivery/index.adp	4 Sep 2004 14:51:21 -0000	1.2
+++ openacs-4/packages/lorsm/www/delivery/index.adp	17 May 2005 17:03:40 -0000	1.3
@@ -1,4 +1,3 @@
-<html>
 <head>
 <title>@course_name@</title>
 
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 -N -r1.3 -r1.4
--- openacs-4/packages/lorsm/www/delivery/menu.adp	29 Nov 2004 17:26:03 -0000	1.3
+++ openacs-4/packages/lorsm/www/delivery/menu.adp	17 May 2005 17:03:40 -0000	1.4
@@ -151,7 +151,7 @@
       <script language="JavaScript">
 <!--
 	menu = new tree (TREE_ITEMS, tree_tpl);
-	
+
 	<if @ims_id@ defined>
 	selectItem(TREE_HASH["ims_id.@ims_id@"]);
       </if>
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 -N -r1.2 -r1.3
--- openacs-4/packages/lorsm/www/delivery/menu.tcl	27 Oct 2004 07:46:53 -0000	1.2
+++ openacs-4/packages/lorsm/www/delivery/menu.tcl	17 May 2005 17:03:40 -0000	1.3
@@ -17,6 +17,13 @@
 } -errors {
 }
 
+
+set org_id [db_string get_org_id { } ]
+set items_list [lorsm::get_items_indent -org_id $org_id]
+template::util::list_of_lists_to_array $items_list items_array
+set fs_package_id [db_string get_fs_package_id { } -default "" ]
+
+set community_id [dotlrn_community::get_community_id]
 set counter 1
 set user_id [ad_conn user_id]
 
@@ -131,57 +138,34 @@
 }
 
 # Counter starts at 1 coz Course Index isn't part of the 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
-} {
 
-    set indent [expr $indent +1]
-
-    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 js [list $indent $item_id $item_title]
+db_foreach organizations { } {
+    # If the course is from lors-central we need an extra query
+    
+    if { [empty_string_p $fs_package_id] } {
+	set extra_query "and i.ims_item_id in ( select
+                                        im.ims_item_id
+                                        from
+                                        ims_cp_items_map im
+                                        where
+                                        man_id = $man_id and org_id = $org_id and community_id = $community_id and
+                                        hide_p = 'f'
+                                      )"
+    } else {
+	set extra_query ""
     }
+    db_foreach sql { } {
+	set indent $items_array($ims_item_id)
+	lappend js [list $indent $ims_item_id $item_title]    
+    }
 }
-    
+
+
+
 if { [info exists js] } {
     set index 0
     set TREE_ITEMS [generate_tree_menu $js $index 1]
     set TREE_HASH [join $TREE_HASH "\n"]
 }
-
 # return_url
 set return_url [dotlrn_community::get_community_url [dotlrn_community::get_community_id]]
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 -N -r1.1 -r1.2
--- openacs-4/packages/lorsm/www/delivery/record-view.tcl	4 Sep 2004 14:51:22 -0000	1.1
+++ openacs-4/packages/lorsm/www/delivery/record-view.tcl	17 May 2005 17:03:40 -0000	1.2
@@ -22,40 +22,69 @@
 
 set views [views::record_view -object_id $item_id -viewer_id $viewer_id]
 
-set revision_id [item::get_best_revision $item_id]
+set ns_item_id $item_id
+set revision_id $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 item_id [lorsm::delivery::get_item_id -revision_id $revision_id]
 
-set url2 "[db_string select_folder_key {select key from fs_folders where folder_id = :folder_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]
 
-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 ""]
+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]
+}
 
-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]
+set url2 $folder_name
 
-# If no fs_item_id, this item is probably a folder
+# Get the href of the item
+set href [lorsm::delivery::get_href -ims_item_id $revision_id]
+
+# Get the item title
+set item_title [lorsm::delivery::get_ims_item_title -ims_item_id $revision_id]
+
+set cr_item_id [lors::cr::get_item_id -folder_id $content_root -name $href]
+
+
+
+if { [empty_string_p $cr_item_id] } {
+    set res_id [lorsm::delivery::get_res_id -ims_item_id $revision_id]
+    if { ![empty_string_p $res_id] } {
+	set file_id [lorsm::delivery::get_file_id -res_id $res_id]
+	if { [empty_string_p $file_id]} {
+	    set cr_item_id ""
+	} else {
+	    set cr_item_id [lorsm::delivery::get_item_id -revision_id $file_id]
+	}
+    } else {
+	set cr_item_id ""
+    }
+}
+
+# If no cr_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 { ![empty_string_p $cr_item_id] } {
 
+    # This is the revision of the file (html, jpg, etc)
+    set cr_revision_id [item::get_best_revision $cr_item_id]
+    set cr_item_mime [item::get_mime_info $cr_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
+	cr_write_content -revision_id $cr_revision_id
 	ad_script_abort
 
     } else {
 	
-	set href $url2$href
+	set href "$url2/$href"
 	regsub -all {//} $href {/} href
-	set imsitem_id $item_id
-
-	#    lorsm::set_content_root content_root
+	set ims_item_id $cr_revision_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
@@ -68,18 +97,17 @@
 	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} ]
+	ad_returnredirect [export_vars -base view/$href {ims_item_id} ]
+	ad_script_abort
     }
 } 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/view/index.vuh
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/delivery/view/index.vuh,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/lorsm/www/delivery/view/index.vuh	4 Sep 2004 14:51:26 -0000	1.1
+++ openacs-4/packages/lorsm/www/delivery/view/index.vuh	17 May 2005 17:03:40 -0000	1.2
@@ -1,55 +1,81 @@
-#################################################
 ad_page_contract {
-   
     @author Unknown
     @creation-date Unknown
     @cvs-id $Id$
 } {    
-    { imsitem_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 {[info exists imsitem_id]} {
-    lorsm::set_ims_item_id $imsitem_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 imsitem_id [lorsm::get_ims_item_id]
+set ns_item_id [lindex [nsv_get delivery_vars [ad_conn session_id]] 1]
+set ims_item_id [lorsm::get_ims_item_id]
 
-#ad_script_abort
+set the_url [join [lrange [split $the_url "/"] 1 end] "/"]
 
 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] } {
+# 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	
+}
+
+ad_script_abort
+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
+   # 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/delivery1/header.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/delivery1/header.adp,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/lorsm/www/delivery1/header.adp	11 May 2005 13:51:48 -0000	1.3
+++ openacs-4/packages/lorsm/www/delivery1/header.adp	17 May 2005 17:03:40 -0000	1.4
@@ -20,11 +20,9 @@
 
       <td align="right" class="header-text">
         <a href="@exit_url@" target="_top">#lorsm.Exit_Course#</a>
-        <img class="header-img" src="/resources/dotlrn/spacer.gif" alt=""  height="1" width="10">
-
+        <img class="header-img" src="/resources/dotlrn/spacer.gif" alt="" height="1" width="10">
         <a href="@logout_url@" target="_top">#lorsm.Log_Out#</a>
-        <img class="header-img" src="/resources/dotlrn/spacer.gif" alt=""  height="1" width="10">
-
+        <img class="header-img" src="/resources/dotlrn/spacer.gif" alt="" height="1" width="10">
       </td>
     </tr>
     </table>
Index: openacs-4/packages/lorsm/www/delivery1/toc.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/delivery1/toc.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/lorsm/www/delivery1/toc.tcl	3 Dec 2004 17:52:50 -0000	1.2
+++ openacs-4/packages/lorsm/www/delivery1/toc.tcl	17 May 2005 17:03:40 -0000	1.3
@@ -65,8 +65,8 @@
         SELECT
 		o.object_id,
  		repeat('&nbsp;', (tree_level(tree_sortkey) - :indent)* 2) as indent,
-		i.item_id,
-                i.title as item_title,
+		i.ims_item_id as item_id,
+                i.item_title as item_title,
                 i.hasmetadata,
                 i.org_id,
                 case 
@@ -79,7 +79,7 @@
 						     WHERE
 						       i2r.res_id = res.res_id
 						      AND
-						       i2r.item_id = i.item_id 
+						       i2r.ims_item_id = i.ims_item_id 
 						     )
                   else ''
                 end as identifierref,
@@ -93,7 +93,7 @@
 						     WHERE
 						       i2r.res_id = res.res_id
 						      AND
-						       i2r.item_id = i.item_id 
+						       i2r.ims_item_id = i.ims_item_id 
 						     )
                   else ''
                 end as type,
@@ -103,11 +103,11 @@
         FROM 
 		acs_objects o, ims_cp_items i, ims_cp_manifests m
 	WHERE 
-		o.object_type = 'ims_item'
+		o.object_type = 'ims_item_object'
            AND
 		i.org_id = :org_id
 	   AND
-		o.object_id = i.item_id
+		o.object_id = i.ims_item_id
            AND
                 m.man_id = :man_id
         ORDER BY 
Index: openacs-4/packages/lorsm/www/delivery2/header.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/delivery2/header.adp,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/lorsm/www/delivery2/header.adp	11 May 2005 13:51:48 -0000	1.3
+++ openacs-4/packages/lorsm/www/delivery2/header.adp	17 May 2005 17:03:41 -0000	1.4
@@ -21,11 +21,9 @@
 
       <td align="right" class="header-text">
         <a href="@exit_url@" target="_top">#lorsm.Exit_Course#</a>
-        <img class="header-img" src="/resources/dotlrn/spacer.gif" alt=""  height="1" width="10">
-
+        <img class="header-img" src="/resources/dotlrn/spacer.gif" alt="" height="1" width="10">
         <a href="@logout_url@" target="_top">#lorsm.Log_Out#</a>
-        <img class="header-img" src="/resources/dotlrn/spacer.gif" alt=""  height="1" width="10">
-
+        <img class="header-img" src="/resources/dotlrn/spacer.gif" alt="" height="1" width="10">
       </td>
     </tr>
     </table>
Index: openacs-4/packages/lorsm/www/delivery2/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/delivery2/index.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/lorsm/www/delivery2/index.tcl	3 Dec 2004 17:52:50 -0000	1.2
+++ openacs-4/packages/lorsm/www/delivery2/index.tcl	17 May 2005 17:03:41 -0000	1.3
@@ -120,21 +120,21 @@
     db_foreach sql {		   
         SELECT
  		(tree_level(tree_sortkey) - :indent) as indent,
-		i.item_id,
-                i.title as item_title
+		i.ims_item_id as item_id,
+                i.item_title as item_title
         FROM 
 		acs_objects o, ims_cp_items i
 	WHERE 
-		o.object_type = 'ims_item'
+		o.object_type = 'ims_item_object'
            AND
 		i.org_id = :org_id
 	   AND
-		o.object_id = i.item_id
+		o.object_id = i.ims_item_id
 	   AND 
 	   	EXISTS
 		(select 1
 		   from acs_object_party_privilege_map p
-		  where p.object_id = i.item_id 
+		  where p.object_id = i.ims_item_id 
 		    and p.party_id = :user_id
 		    and p.privilege = 'read')
 
Index: openacs-4/packages/lorsm/www/delivery2/record-view.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/delivery2/record-view.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/lorsm/www/delivery2/record-view.tcl	4 Sep 2004 14:51:26 -0000	1.1
+++ openacs-4/packages/lorsm/www/delivery2/record-view.tcl	17 May 2005 17:03:41 -0000	1.2
@@ -29,7 +29,7 @@
 
 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"
 
Index: openacs-4/packages/lorsm/www/export/index.vuh
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/export/Attic/index.vuh,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/lorsm/www/export/index.vuh	27 Oct 2004 06:04:28 -0000	1.3
+++ openacs-4/packages/lorsm/www/export/index.vuh	17 May 2005 17:03:41 -0000	1.4
@@ -31,11 +31,11 @@
     if {![empty_string_p $ext]} {
         append download_name ".${ext}"
     }
-
     ad_returnredirect "${folder_id}/${download_name}"
     ad_script_abort
 }
 
+
 # convenient way to get the values out of a list
 foreach {folder_id download_name} [split [ad_conn path_info] /] {break}
 
@@ -75,9 +75,10 @@
     error $errmsg
 }
 
+
 # return the archive to the connection.
 ns_returnfile 200 application/octet-stream $out_file
 
 # clean everything up
-file delete -force $in_path
-file delete -force $out_path
+exec rm -fr $in_path
+exec rm -fr $out_path
Index: openacs-4/packages/lorsm/www/lib/repository-shared-courses.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/lib/Attic/repository-shared-courses.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/lorsm/www/lib/repository-shared-courses.tcl	3 Dec 2004 17:52:50 -0000	1.2
+++ openacs-4/packages/lorsm/www/lib/repository-shared-courses.tcl	17 May 2005 17:03:41 -0000	1.3
@@ -89,6 +89,8 @@
            cp.man_id = acs.object_id
     and
            cp.isshared = 't'
+    and cp.man_id in ( select cr.live_revision from cr_items cr
+                       where content_type = 'ims_manifest_object' )
     order by acs.creation_date desc
 } {
     set ims_md_id $man_id
Index: openacs-4/packages/lorsm/www/md/addmd.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/md/Attic/addmd.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/lorsm/www/md/addmd.tcl	3 Dec 2004 17:52:50 -0000	1.2
+++ openacs-4/packages/lorsm/www/md/addmd.tcl	17 May 2005 17:03:41 -0000	1.3
@@ -67,25 +67,25 @@
 
 	switch $object_type {
 
-	    "ims_manifest" {
+	    "ims_manifest_object" {
 
 		db_dml upd_manifest "
             		update ims_cp_manifests set hasmetadata = 't'
 		            where man_id = :ims_md_id"
 	    }
-	    "ims_item" {
+	    "ims_item_object" {
 		
 		db_dml upd_item "
             		update ims_cp_items set hasmetadata = 't'
-		            where item_id = :ims_md_id"
+		            where ims_item_id = :ims_md_id"
 	    }
-	    "ims_organization" {
+	    "ims_organization_object" {
 
 		db_dml upd_organization "
             		update ims_cp_organizations set hasmetadata = 't'
 		            where org_id = :ims_md_id"
 	    }
-	    "ims_resource" {
+	    "ims_resource_object" {
 
 		db_dml upd_resource "
             		update ims_cp_resources set hasmetadata = 't'
Index: openacs-4/packages/lorsm/www/shared/course-info.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/shared/Attic/course-info.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/lorsm/www/shared/course-info.tcl	3 Dec 2004 17:52:54 -0000	1.3
+++ openacs-4/packages/lorsm/www/shared/course-info.tcl	17 May 2005 17:03:43 -0000	1.4
@@ -131,7 +131,7 @@
 db_foreach organizations {
     select 
        org.org_id,
-       org.title as org_title,
+       org.org_title as org_title,
        org.hasmetadata,
        tree_level(o.tree_sortkey) as indent
     from
@@ -164,8 +164,8 @@
         SELECT
 		o.object_id,
  		repeat('&nbsp;', (tree_level(tree_sortkey) - :indent)* 3) as indent,
-		i.item_id,
-                i.title as item_title,
+		i.ims_item_id as item_id,
+                i.item_title as item_title,
                 i.hasmetadata,
                 i.org_id,
                 case
@@ -184,7 +184,7 @@
 						     WHERE
 						       i2r.res_id = res.res_id
 						      AND
-						       i2r.item_id = i.item_id 
+						       i2r.ims_item_id = i.ims_item_id 
 )
                   else ''
                 end as identifierref,
@@ -198,7 +198,7 @@
 						     WHERE
 						       i2r.res_id = res.res_id
 						      AND
-						       i2r.item_id = i.item_id 
+						       i2r.ims_item_id = i.ims_item_id 
 )
                   else ''
                 end as type,
@@ -208,11 +208,11 @@
         FROM 
 		acs_objects o, ims_cp_items i, ims_cp_manifests m
 	WHERE 
-		o.object_type = 'ims_item'
+		o.object_type = 'ims_item_object'
            AND
 		i.org_id = :org_id
 	   AND
-		o.object_id = i.item_id
+		o.object_id = i.ims_item_id
            AND
                 m.man_id = :man_id
         ORDER BY 
Index: openacs-4/packages/lorsm/www/tracking/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/tracking/Attic/index.tcl,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/lorsm/www/tracking/index.tcl	24 Feb 2005 13:33:22 -0000	1.5
+++ openacs-4/packages/lorsm/www/tracking/index.tcl	17 May 2005 17:03:43 -0000	1.6
@@ -113,12 +113,12 @@
 
     db_multirow -extend {viewer_name} object_views objects_views "
         select v.*,
-               i.title
+               i.item_title as title
         from views v,
              ims_cp_items i,
              ims_cp_organizations o
         where
-             i.item_id = v.object_id
+             i.ims_item_id = v.object_id
         and
              i.org_id = o.org_id
 	and
@@ -200,12 +200,12 @@
 
     db_multirow object_views objects_views "
         select v.*,
-               i.title
+               i.item_title as title
         from view_aggregates v,
              ims_cp_items i,
              ims_cp_organizations o
         where
-             i.item_id = v.object_id
+             i.ims_item_id = v.object_id
         and
              i.org_id = o.org_id
 	and