Index: openacs-4/packages/lorsm/lib/repository-shared-courses.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/lib/repository-shared-courses.tcl,v
diff -u -N -r1.7 -r1.8
--- openacs-4/packages/lorsm/lib/repository-shared-courses.tcl	12 Dec 2008 14:25:32 -0000	1.7
+++ openacs-4/packages/lorsm/lib/repository-shared-courses.tcl	14 Feb 2009 22:33:20 -0000	1.8
@@ -21,10 +21,9 @@
 set context [list "[_ lorsm.Shared_Courses]"]
 
 set package_id [ad_conn package_id]
-set community_id [dotlrn_community::get_community_id]
+set community_id [lors::get_community_id]
+set com_url [lors::get_community_url]
 
-set com_url [dotlrn_community::get_community_url $community_id]
-
 template::list::create \
     -name d_courses \
     -multirow d_courses \
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.26 -r1.27
--- openacs-4/packages/lorsm/lib/user-lorsm.tcl	12 Dec 2008 14:25:32 -0000	1.26
+++ openacs-4/packages/lorsm/lib/user-lorsm.tcl	14 Feb 2009 22:33:20 -0000	1.27
@@ -15,7 +15,7 @@
 }
 
 set user_id [ad_conn user_id]
-set community_id [dotlrn_community::get_community_id]
+set community_id [lors::get_community_id]
 
 set lors_central_package_id [apm_package_id_from_key "lors-central"]
 set lors_central_url [apm_package_url_from_id $lors_central_package_id]
@@ -43,9 +43,9 @@
     append elements_list {
         subject {
             label "[_ lorsm.Subject]"
-            display_eval {[dotlrn_community::get_community_name $community_id]}
+            display_eval {[lors::get_community_name]}
             html { align center style "width:20%" }
-            link_url_eval {[dotlrn_community::get_community_url $community_id]}
+            link_url_eval {[lors::get_community_url]}
             link_html {title "[_ lorsm.Access_Course]"}
         }
     }
Index: openacs-4/packages/lorsm/tcl/lorsm-import-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/tcl/lorsm-import-procs.tcl,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/lorsm/tcl/lorsm-import-procs.tcl	12 Dec 2008 14:25:33 -0000	1.5
+++ openacs-4/packages/lorsm/tcl/lorsm-import-procs.tcl	14 Feb 2009 22:33:20 -0000	1.6
@@ -30,13 +30,13 @@
 } {
 
     set user_id [ad_conn user_id]
-    set community_id [dotlrn_community::get_community_id]
+    set community_id [lors::get_community_id]
 
     # Gets file-storage root folder_id
     # eventually, we should provide an option so it can be imported in
     # different subfolders
     set fs_package_id [site_node_apm_integration::get_child_package_id \
-                        -package_id [dotlrn_community::get_package_id $community_id] \
+                        -package_id [lors::get_community_package_id] \
                         -package_key "file-storage"]
 
     #set fs_package_id [apm_package_id_from_key "file-storage"] -- if used
@@ -340,7 +340,7 @@
 
             # Set read permissions for community/class dotlrn_member_rel
 
-            set community_id [dotlrn_community::get_community_id]
+            set community_id [lors::get_community_id]
 
             set party_id_member [db_string party_id_member {}]
 
@@ -605,7 +605,7 @@
 
             # Set read permissions for community/class dotlrn_member_rel
 
-            set community_id [dotlrn_community::get_community_id]
+            set community_id [lors::get_community_id]
 
             set party_id_member [db_string party_id_member {}]
 
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.22 -r1.23
--- openacs-4/packages/lorsm/tcl/lorsm-procs.tcl	12 Dec 2008 14:25:33 -0000	1.22
+++ openacs-4/packages/lorsm/tcl/lorsm-procs.tcl	14 Feb 2009 22:33:20 -0000	1.23
@@ -636,11 +636,9 @@
     # Save the current package_id to restore when the object is
     # imported
     set current_package_id [ad_conn package_id]
-    # Get the package_id associated with the current community
-    # FIXME this is a hack until I figure out how to get the
-    # package_id of the current community
-    ad_conn -set package_id [db_string get_package_id {}]
 
+    ad_conn -set package_id [lors::get_community_package_id $community_id]
+
     set object_id [lorsm::import_imscp -upload_file $xml_file -tmp_dir $tmp_dir]
 
     # Restore the package_id
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.5 -r1.6
--- openacs-4/packages/lorsm/tcl/lorsm-procs.xql	12 Dec 2008 14:25:34 -0000	1.5
+++ openacs-4/packages/lorsm/tcl/lorsm-procs.xql	14 Feb 2009 22:33:20 -0000	1.6
@@ -229,16 +229,6 @@
         </querytext>
     </fullquery>
 
-    <fullquery name="lorsm::register_xml_object_id.get_package_id">
-        <querytext>
-            select dotlrn_community_applets.package_id
-            from dotlrn_community_applets
-                join apm_packages on (dotlrn_community_applets.package_id=apm_packages.package_id)
-            where community_id = :community_id
-                and package_key='lorsm'
-        </querytext>
-    </fullquery>
-
     <fullquery name="lorsm::set_custom_page.get_page">
         <querytext>
             select 1
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.12 -r1.13
--- openacs-4/packages/lorsm/templates/lorsm-default.tcl	12 Dec 2008 14:25:34 -0000	1.12
+++ openacs-4/packages/lorsm/templates/lorsm-default.tcl	14 Feb 2009 22:33:20 -0000	1.13
@@ -9,7 +9,6 @@
 set title ""
 multirow create children child_item_id child_title
 set parent_item ""
-#set community_url [dotlrn_community::get_community_url [dotlrn_community::get_community_id]]
 set community_url ""
 
 # There are pages that are not necesarily part of one ims_item_id
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 -r1.8 -r1.9
--- openacs-4/packages/lorsm/templates/lorsm-no-index.tcl	12 Dec 2008 14:25:34 -0000	1.8
+++ openacs-4/packages/lorsm/templates/lorsm-no-index.tcl	14 Feb 2009 22:33:20 -0000	1.9
@@ -53,7 +53,7 @@
 
         # Student tracking
         set package_id [ad_conn package_id]
-        set community_id [dotlrn_community::get_community_id]
+        set community_id [lors::get_community_id]
 
         if {[lorsm::track::istrackable -course_id $man_id -package_id $package_id]} {
             set track_id [lorsm::track::new \
Index: openacs-4/packages/lorsm/www/delivery/applet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/delivery/applet.tcl,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/lorsm/www/delivery/applet.tcl	12 Dec 2008 14:25:39 -0000	1.5
+++ openacs-4/packages/lorsm/www/delivery/applet.tcl	14 Feb 2009 22:33:20 -0000	1.6
@@ -42,7 +42,7 @@
 
 # Student tracking
 set package_id [ad_conn package_id]
-set community_id [dotlrn_community::get_community_id]
+set community_id [lors::get_community_id]
 set user_id [ad_conn user_id]
 
 
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.10 -r1.11
--- openacs-4/packages/lorsm/www/delivery/body.tcl	12 Dec 2008 14:25:39 -0000	1.10
+++ openacs-4/packages/lorsm/www/delivery/body.tcl	14 Feb 2009 22:33:20 -0000	1.11
@@ -17,7 +17,7 @@
 }
 
 set user_id [ad_conn user_id]
-set community_id [dotlrn_community::get_community_id]
+set community_id [lors::get_community_id]
 
 if { ! [info exists lmsfinish] } {
         set lmsfinish 0
Index: openacs-4/packages/lorsm/www/delivery/bottom.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/delivery/bottom.tcl,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/lorsm/www/delivery/bottom.tcl	12 Dec 2008 14:25:39 -0000	1.6
+++ openacs-4/packages/lorsm/www/delivery/bottom.tcl	14 Feb 2009 22:33:20 -0000	1.7
@@ -12,7 +12,7 @@
 
 # Student tracking
 set package_id [ad_conn package_id]
-set community_id [dotlrn_community::get_community_id]
+set community_id [lors::get_community_id]
 set user_id [ad_conn user_id]
 
 if {[lorsm::track::istrackable \
@@ -27,8 +27,7 @@
 }
 
 # return_url
-set return_url [dotlrn_community::get_community_url \
-                    [dotlrn_community::get_community_id]]
+set return_url [lors::get_community_url]
 
 set item_list [lorsm::get_item_list $man_id $user_id]
 
Index: openacs-4/packages/lorsm/www/delivery/delivery-context-bar.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/delivery/delivery-context-bar.tcl,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/lorsm/www/delivery/delivery-context-bar.tcl	12 Dec 2008 14:25:39 -0000	1.4
+++ openacs-4/packages/lorsm/www/delivery/delivery-context-bar.tcl	14 Feb 2009 22:33:20 -0000	1.5
@@ -16,9 +16,9 @@
     set item_id [ad_get_client_property lorsm ims_id]
 }
 
-set community_id [dotlrn_community::get_community_id]
+set community_id [lors::get_community_id]
 set user_id [ad_conn user_id]
-set lorsm_url [dotlrn_community::get_community_url $community_id]lorsm/delivery
+set lorsm_url [ad_conn package_url]delivery
 
 # Student tracking
 set package_id [ad_conn package_id]
@@ -33,7 +33,7 @@
 #}
 
 # return_url
-set return_url [dotlrn_community::get_community_url [dotlrn_community::get_community_id]]
+set return_url [lors::get_community_url]
 
 set item_list [lorsm::get_item_list $man_id $user_id]
 
Index: openacs-4/packages/lorsm/www/delivery/delivery-progress-bar.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/delivery/delivery-progress-bar.tcl,v
diff -u -N -r1.13 -r1.14
--- openacs-4/packages/lorsm/www/delivery/delivery-progress-bar.tcl	12 Dec 2008 14:25:39 -0000	1.13
+++ openacs-4/packages/lorsm/www/delivery/delivery-progress-bar.tcl	14 Feb 2009 22:33:20 -0000	1.14
@@ -20,7 +20,7 @@
     set item_id [ad_get_client_property lorsm ims_id]
 }
 ns_log notice "delivery progress bar DEBUG:: item_id $item_id"
-set community_id [dotlrn_community::get_community_id]
+set community_id [lors::get_community_id]
 set user_id [ad_conn user_id]
 
 set track_id [lorsm::track::get_track_id \
@@ -29,12 +29,12 @@
                 -community_id $community_id]
 
 #ns_log notice "DAVEB LORSM BEFORE TRACK_ID='${track_id}'"
-set lorsm_url [dotlrn_community::get_community_url $community_id]lorsm/delivery
+set lorsm_url [ad_conn package_url]delivery
 
 set package_id [site_node::get_element -url $lorsm_url -element package_id]
 
 # return_url
-set return_url [dotlrn_community::get_community_url [dotlrn_community::get_community_id]]
+set return_url [lors::get_community_url]
 
 set item_list [lorsm::get_item_list $man_id $user_id]
 set first_item_id [lindex $item_list 0]
Index: openacs-4/packages/lorsm/www/delivery/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/delivery/index.tcl,v
diff -u -N -r1.16 -r1.17
--- openacs-4/packages/lorsm/www/delivery/index.tcl	12 Dec 2008 14:25:40 -0000	1.16
+++ openacs-4/packages/lorsm/www/delivery/index.tcl	14 Feb 2009 22:33:20 -0000	1.17
@@ -83,11 +83,11 @@
     }
 }
 
-set return_url [dotlrn_community::get_community_url [dotlrn_community::get_community_id]]
+set community_id [lors::get_community_id]
+set return_url [lors::get_community_url]
 
 # Student tracking
 set package_id [ad_conn package_id]
-set community_id [dotlrn_community::get_community_id]
 ad_set_client_property lorsm currentcourse $man_id
 
 
Index: openacs-4/packages/lorsm/www/delivery/index.vuh
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/delivery/index.vuh,v
diff -u -N -r1.13 -r1.14
--- openacs-4/packages/lorsm/www/delivery/index.vuh	12 Dec 2008 14:25:40 -0000	1.13
+++ openacs-4/packages/lorsm/www/delivery/index.vuh	14 Feb 2009 22:33:20 -0000	1.14
@@ -6,8 +6,9 @@
 set path_info [ad_conn path_info]
 set path_list [split $path_info /]
 set base [lindex $path_list 0]
-set dotlrn_package_id [dotlrn_community::get_community_id]
-set lorsm_url [dotlrn_community::get_community_url $dotlrn_package_id]lorsm/
+
+set community_id [lors::get_community_id]
+set lorsm_url [ad_conn package_url]
 set delivery_url ${lorsm_url}delivery
 ##########
 # figure out the next page after we are done with this...
@@ -18,7 +19,7 @@
 }
 set user_id [ad_conn user_id]
 
-set enabled_p [db_string enabled_p "select isenabled from ims_cp_manifest_class where man_id=:man_id and community_id=:dotlrn_package_id" -default "f"]
+set enabled_p [db_string enabled_p {} -default "f"]
 set item_list [lorsm::get_item_list $man_id $user_id]
 
 if {$enabled_p} {
@@ -75,8 +76,9 @@
     assessment {
             # find assessment package_id
             # get dotlrn package_id
-            set assessment_package_id [dotlrn_community::get_applet_package_id -community_id $dotlrn_package_id -applet_key dotlrn_assessment]
-    ns_log notice " RESETTING ad conn package id $assessment_package_id"
+            set assessment_package_id [site_node::get_children \
+                                          -community_id $community_id \
+                                          -package_key assessment]
             ad_conn -set package_id $assessment_package_id
 
         if {[string match *view* $path_info]} {
Index: openacs-4/packages/lorsm/www/delivery/menu-mk.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/delivery/menu-mk.tcl,v
diff -u -N -r1.7 -r1.8
--- openacs-4/packages/lorsm/www/delivery/menu-mk.tcl	12 Dec 2008 14:25:40 -0000	1.7
+++ openacs-4/packages/lorsm/www/delivery/menu-mk.tcl	14 Feb 2009 22:33:20 -0000	1.8
@@ -80,7 +80,7 @@
 
 template::multirow create tree_items icon link label indent last_indent target
 
-set community_id [dotlrn_community::get_community_id]
+set community_id [lors::get_community_id]
 set counter 1
 set user_id [ad_conn user_id]
 
@@ -405,6 +405,5 @@
     }
 }
 # return_url
-set return_url [dotlrn_community::get_community_url \
-                    [dotlrn_community::get_community_id]]
+set return_url [lors::get_community_url]
 
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.11 -r1.12
--- openacs-4/packages/lorsm/www/delivery/menu.tcl	12 Dec 2008 14:25:40 -0000	1.11
+++ openacs-4/packages/lorsm/www/delivery/menu.tcl	14 Feb 2009 22:33:20 -0000	1.12
@@ -41,7 +41,7 @@
 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 community_id [lors::get_community_id]
 set counter 1
 set user_id [ad_conn user_id]
 
@@ -180,5 +180,4 @@
     set TREE_HASH [join $TREE_HASH "\n"]
 }
 # return_url
-set return_url [dotlrn_community::get_community_url \
-                    [dotlrn_community::get_community_id]]
+set return_url [lors::get_community_url]
Index: openacs-4/packages/lorsm/www/delivery/popup.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/delivery/popup.tcl,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/lorsm/www/delivery/popup.tcl	17 Nov 2008 13:38:37 -0000	1.4
+++ openacs-4/packages/lorsm/www/delivery/popup.tcl	14 Feb 2009 22:33:20 -0000	1.5
@@ -33,7 +33,7 @@
 
 # Student tracking
 set package_id [ad_conn package_id]
-set community_id [dotlrn_community::get_community_id]
+set community_id [lors::get_community_id]
 set user_id [ad_conn user_id]
 
 if { ! [info exists ims_item_id] } {
@@ -48,5 +48,4 @@
                 -url {ims_item_id man_id}]
 
 # return_url
-set return_url  [dotlrn_community::get_community_url \
-                [dotlrn_community::get_community_id]]
+set return_url  [lors::get_community_url]
Index: openacs-4/packages/lorsm/www/delivery/popup2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/delivery/popup2.tcl,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/lorsm/www/delivery/popup2.tcl	12 Dec 2008 14:25:40 -0000	1.4
+++ openacs-4/packages/lorsm/www/delivery/popup2.tcl	14 Feb 2009 22:33:20 -0000	1.5
@@ -46,7 +46,7 @@
 
 # Student tracking
 set package_id [ad_conn package_id]
-set community_id [dotlrn_community::get_community_id]
+set community_id [lors::get_community_id]
 set user_id [ad_conn user_id]
 ad_set_client_property lorsm currentcourse $man_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.17 -r1.18
--- openacs-4/packages/lorsm/www/delivery/record-view.tcl	12 Dec 2008 14:25:40 -0000	1.17
+++ openacs-4/packages/lorsm/www/delivery/record-view.tcl	14 Feb 2009 22:33:20 -0000	1.18
@@ -100,7 +100,7 @@
     # we check if the user has access right to the item
     #we analize now prerequisites. - the logic is identical  to menu.
 
-    set community_id [dotlrn_community::get_community_id]
+    set community_id [lors::get_community_id]
     set user_id [ad_conn user_id]
 
     db_1row getitemattributes {}
Index: openacs-4/packages/lorsm/www/delivery/servlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/delivery/servlet.tcl,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/lorsm/www/delivery/servlet.tcl	12 Dec 2008 14:25:40 -0000	1.6
+++ openacs-4/packages/lorsm/www/delivery/servlet.tcl	14 Feb 2009 22:33:20 -0000	1.7
@@ -49,7 +49,7 @@
     ns_log $basiclevel "SCORM missing ims_item_id : $currentpage"
 }
 
-set community_id [dotlrn_community::get_community_id]
+set community_id [lors::get_community_id]
 
 ns_log $basiclevel "SCORM user: $user_id course: $currentcourse \
                     ims_item_id: $currentpage community_id: $community_id"
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 -r1.3 -r1.4
--- openacs-4/packages/lorsm/www/delivery-bottom-bar/body.tcl	16 Jan 2008 16:54:45 -0000	1.3
+++ openacs-4/packages/lorsm/www/delivery-bottom-bar/body.tcl	14 Feb 2009 22:33:21 -0000	1.4
@@ -10,7 +10,7 @@
 }
 
 set user_id [ad_conn user_id]
-set community_id [dotlrn_community::get_community_id]
+set community_id [lors::get_community_id]
 
 
 db_0or1row get_last_viewed {
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 -r1.3 -r1.4
--- openacs-4/packages/lorsm/www/delivery-bottom-bar/bottom.tcl	16 Jan 2008 16:54:45 -0000	1.3
+++ openacs-4/packages/lorsm/www/delivery-bottom-bar/bottom.tcl	14 Feb 2009 22:33:21 -0000	1.4
@@ -12,7 +12,7 @@
 
 # Student tracking
 set package_id [ad_conn package_id]
-set community_id [dotlrn_community::get_community_id]
+set community_id [lors::get_community_id]
 set user_id [ad_conn user_id]
 
 if {[lorsm::track::istrackable -course_id $man_id -package_id $package_id]} {
@@ -26,7 +26,7 @@
 }
 
 # return_url
-set return_url [dotlrn_community::get_community_url [dotlrn_community::get_community_id]]
+set return_url [lors::get_community_url]
 
 set item_list [lorsm::get_item_list $man_id $user_id]
 
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 -r1.2 -r1.3
--- openacs-4/packages/lorsm/www/delivery-bottom-bar/index.tcl	7 Jun 2006 14:05:45 -0000	1.2
+++ openacs-4/packages/lorsm/www/delivery-bottom-bar/index.tcl	14 Feb 2009 22:33:21 -0000	1.3
@@ -16,7 +16,7 @@
 }
 
 set user_id [ad_conn user_id]
-set community_id [dotlrn_community::get_community_id]
+set community_id [lors::get_community_id]
 
 # Get the course name
 if {[db_0or1row manifest "
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 -r1.2 -r1.3
--- openacs-4/packages/lorsm/www/delivery-bottom-bar/view/index.vuh	7 Jun 2006 14:05:45 -0000	1.2
+++ openacs-4/packages/lorsm/www/delivery-bottom-bar/view/index.vuh	14 Feb 2009 22:33:21 -0000	1.3
@@ -10,7 +10,7 @@
 
 # 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]]]
+    ad_returnredirect [lors::get_community_url]
 }
 
 if {[info exists ims_item_id]} {
Index: openacs-4/packages/lorsm/www/delivery-no-index/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/delivery-no-index/index.tcl,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/lorsm/www/delivery-no-index/index.tcl	16 Jan 2008 16:54:45 -0000	1.5
+++ openacs-4/packages/lorsm/www/delivery-no-index/index.tcl	14 Feb 2009 22:33:21 -0000	1.6
@@ -17,7 +17,7 @@
 }
 
 set user_id [ad_conn user_id]
-set community_id [dotlrn_community::get_community_id]
+set community_id [lors::get_community_id]
 
 if { [info exists ims_id] } {
     set item_id $ims_id
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 -r1.3 -r1.4
--- openacs-4/packages/lorsm/www/delivery-no-index/view/index.vuh	18 May 2005 07:45:25 -0000	1.3
+++ openacs-4/packages/lorsm/www/delivery-no-index/view/index.vuh	14 Feb 2009 22:33:21 -0000	1.4
@@ -9,7 +9,7 @@
 
 # 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]]]
+    ad_returnredirect [lors::get_community_url]
 }
 
 if {[info exists ims_item_id]} {
Index: openacs-4/packages/lorsm/www/delivery-scorm/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/delivery-scorm/index.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/lorsm/www/delivery-scorm/index.tcl	26 May 2005 21:13:32 -0000	1.1
+++ openacs-4/packages/lorsm/www/delivery-scorm/index.tcl	14 Feb 2009 22:33:21 -0000	1.2
@@ -53,7 +53,7 @@
 
 # Student tracking
 set package_id [ad_conn package_id]
-set community_id [dotlrn_community::get_community_id]
+set community_id [lors::get_community_id]
 set user_id [ad_conn user_id]
 ad_set_client_property lorsm currentcourse $man_id
 
Index: openacs-4/packages/lorsm/www/delivery-scorm/menu.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/delivery-scorm/menu.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/lorsm/www/delivery-scorm/menu.tcl	26 May 2005 21:13:32 -0000	1.1
+++ openacs-4/packages/lorsm/www/delivery-scorm/menu.tcl	14 Feb 2009 22:33:21 -0000	1.2
@@ -182,4 +182,4 @@
 }
 
 # return_url
-set return_url [dotlrn_community::get_community_url [dotlrn_community::get_community_id]]
+set return_url [lors::get_community_url]
Index: openacs-4/packages/lorsm/www/delivery-scorm/servlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/delivery-scorm/servlet.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/lorsm/www/delivery-scorm/servlet.tcl	26 May 2005 21:13:32 -0000	1.1
+++ openacs-4/packages/lorsm/www/delivery-scorm/servlet.tcl	14 Feb 2009 22:33:21 -0000	1.2
@@ -57,7 +57,7 @@
 set currenttrackid [ad_get_client_property lorsm currenttrackid]
 set lorsmstudenttrack [ad_get_client_property lorsm studenttrack]
 
-set community_id [dotlrn_community::get_community_id]
+set community_id [lors::get_community_id]
 set package_id [ad_conn package_id]
 
 ns_log $level "Applet beginning with parameters current: $currenttrackid lorsm - $lorsmstudenttrack community: $community_id"
Index: openacs-4/packages/lorsm/www/delivery-scorm/view/index.vuh
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/delivery-scorm/view/index.vuh,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/lorsm/www/delivery-scorm/view/index.vuh	26 May 2005 21:13:34 -0000	1.1
+++ openacs-4/packages/lorsm/www/delivery-scorm/view/index.vuh	14 Feb 2009 22:33:21 -0000	1.2
@@ -8,7 +8,7 @@
  
 # 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]]]
+    ad_returnredirect [lors::get_community_url]
 }
 
 if {[info exists ims_item_id]} {
Index: openacs-4/packages/lorsm/www/delivery1/header.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/delivery1/header.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/lorsm/www/delivery1/header.tcl	17 May 2005 17:03:40 -0000	1.2
+++ openacs-4/packages/lorsm/www/delivery1/header.tcl	14 Feb 2009 22:33:21 -0000	1.3
@@ -16,7 +16,7 @@
 } -errors {
 }
 
-set return_url [dotlrn_community::get_community_url [dotlrn_community::get_community_id]]
+set return_url [lors::get_community_url]
 
 
 # urls
Index: openacs-4/packages/lorsm/www/delivery1/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/delivery1/index.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/lorsm/www/delivery1/index.tcl	17 May 2005 17:03:40 -0000	1.3
+++ openacs-4/packages/lorsm/www/delivery1/index.tcl	14 Feb 2009 22:33:21 -0000	1.4
@@ -60,7 +60,7 @@
 
     # Student tracking
     set package_id [ad_conn package_id]
-    set community_id [dotlrn_community::get_community_id]
+    set community_id [lors::get_community_id]
     set user_id [ad_conn user_id]
 
     if {[lorsm::track::istrackable -course_id $man_id -package_id $package_id]} {
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.3 -r1.4
--- openacs-4/packages/lorsm/www/delivery1/toc.tcl	17 May 2005 17:03:40 -0000	1.3
+++ openacs-4/packages/lorsm/www/delivery1/toc.tcl	14 Feb 2009 22:33:21 -0000	1.4
@@ -25,9 +25,9 @@
 # other instances of file-storages of other classes.  See
 # documentation for further details.
 
-set community_id [dotlrn_community::get_community_id]
+set community_id [lors::get_community_id]
 set fs_local_package_id [site_node_apm_integration::get_child_package_id \
-		       -package_id [dotlrn_community::get_package_id $community_id] \
+		       -package_id [lors::get_community_package_id] \
 		       -package_key "file-storage"\
 		      ]
 set track_id [lorsm::track::istrackable -course_id $man_id -package_id $package_id]
Index: openacs-4/packages/lorsm/www/delivery2/header.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/delivery2/header.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/lorsm/www/delivery2/header.tcl	17 May 2005 17:03:41 -0000	1.2
+++ openacs-4/packages/lorsm/www/delivery2/header.tcl	14 Feb 2009 22:33:21 -0000	1.3
@@ -16,7 +16,7 @@
 } -errors {
 }
 
-set return_url [dotlrn_community::get_community_url [dotlrn_community::get_community_id]]
+set return_url [lors::get_community_url]
 
 
 # urls
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.3 -r1.4
--- openacs-4/packages/lorsm/www/delivery2/index.tcl	17 May 2005 17:03:41 -0000	1.3
+++ openacs-4/packages/lorsm/www/delivery2/index.tcl	14 Feb 2009 22:33:21 -0000	1.4
@@ -25,9 +25,9 @@
 # other instances of file-storages of other classes.  See
 # documentation for further details.
 
-set community_id [dotlrn_community::get_community_id]
+set community_id [lors::get_community_id]
 set fs_local_package_id [site_node_apm_integration::get_child_package_id \
-		       -package_id [dotlrn_community::get_package_id $community_id] \
+		       -package_id [lors::get_community_package_id] \
 		       -package_key "file-storage"\
 		      ]
 
@@ -78,7 +78,6 @@
 
     # 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]} {
@@ -219,4 +218,4 @@
 set jsfile [concat $jsfile "var nCols = [expr $maxcols + 1];"]
 
 
-#ns_write $jsfile
\ No newline at end of file
+#ns_write $jsfile