Index: openacs-4/packages/lors/lors.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lors/lors.info,v diff -u -N -r1.16 -r1.17 --- openacs-4/packages/lors/lors.info 9 Feb 2009 03:57:30 -0000 1.16 +++ openacs-4/packages/lors/lors.info 10 Feb 2009 02:20:33 -0000 1.17 @@ -16,6 +16,7 @@ http://www.gnu.org/copyleft/gpl.html 1 + Index: openacs-4/packages/lors/lib/course-new.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lors/lib/course-new.tcl,v diff -u -N -r1.6 -r1.7 --- openacs-4/packages/lors/lib/course-new.tcl 17 Nov 2008 13:35:00 -0000 1.6 +++ openacs-4/packages/lors/lib/course-new.tcl 10 Feb 2009 02:20:33 -0000 1.7 @@ -10,7 +10,7 @@ # ad_form requires man_id NOT to be set if its new if {![info exists community_id]} { - set community_id [dotlrn_community::get_community_id] + set community_id [lors::get_community_id] } if {![info exists package_id]} { Index: openacs-4/packages/lors/lib/course-structure.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lors/lib/course-structure.tcl,v diff -u -N -r1.14 -r1.15 --- openacs-4/packages/lors/lib/course-structure.tcl 3 Dec 2008 12:36:42 -0000 1.14 +++ openacs-4/packages/lors/lib/course-structure.tcl 10 Feb 2009 02:20:33 -0000 1.15 @@ -15,7 +15,11 @@ } set package_id [ad_conn package_id] -set community_id [dotlrn_community::get_community_id] + +array set site_node \ + [application_group::closest_ancestor_application_group_site_node -node_id [ad_conn node_id]] +set community_id [application_group::group_id_from_package_id -package_id $site_node(object_id)] +set community_package_id $site_node(object_id) set return_url [ad_return_url] @@ -48,7 +52,7 @@ 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_id $community_package_id \ -package_key "file-storage"] # Instance set instance [lorsm::get_course_name -manifest_id $man_id] Index: openacs-4/packages/lors/tcl/lors-imscp-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lors/tcl/lors-imscp-procs.tcl,v diff -u -N -r1.20 -r1.21 --- openacs-4/packages/lors/tcl/lors-imscp-procs.tcl 9 Feb 2009 03:57:30 -0000 1.20 +++ openacs-4/packages/lors/tcl/lors-imscp-procs.tcl 10 Feb 2009 02:20:33 -0000 1.21 @@ -552,37 +552,17 @@ db_dml set_sort_order {} + # DRB: I stripped out a bunch of commented-out permission twiddling that leads me + # to believe this is pretty much bogus. However I've left in the toggle inherit. + # This doesn't lead to a dotlrn dependency per se because this is driven throughout + # by parameters and an extension to the course XML (manifest? haven't looked closely). + # My work for MGH doesn't extend to fixing every stupid thing I find, just getting + # lorsm/lors to work without dotlrn being present, without breaking it within the + # dotlrn environment. + if {![empty_string_p $dotlrn_permission]} { permission::toggle_inherit -object_id $item_id - #set community_id [dotlrn_community::get_community_id] - - # Set read permissions for community/class dotlrn_admin_rel - - #set party_id_admin [db_string party_id {select segment_id from rel_segments \ - where group_id = :community_id \ - and rel_type = 'dotlrn_admin_rel'}] - - #permission::grant -party_id $party_id_admin -object_id $item_id -privilege read - - - # Set read permissions for *all* other professors within .LRN - # (so they can see the content) - - #set party_id_professor [db_string party_id {select segment_id from rel_segments \ - where rel_type = 'dotlrn_professor_profile_rel'}] - - #permission::grant -party_id $party_id_professor -object_id $item_id -privilege read - - # Set read permissions for *all* other admins within .LRN - # (so they can see the content) - - #set party_id_admins [db_string party_id {select segment_id from rel_segments \ - where rel_type = 'dotlrn_admin_profile_rel'}] - - #permission::grant -party_id $party_id_admins -object_id $item_id -privilege read - - #ns_log Notice "ims_item_id ($item_id) read permissions granted for community admins" } return $item_id } Index: openacs-4/packages/lors/tcl/lors-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lors/tcl/lors-procs.tcl,v diff -u -N -r1.13 -r1.14 --- openacs-4/packages/lors/tcl/lors-procs.tcl 9 Feb 2009 03:57:30 -0000 1.13 +++ openacs-4/packages/lors/tcl/lors-procs.tcl 10 Feb 2009 02:20:33 -0000 1.14 @@ -11,7 +11,7 @@ namespace eval lors:: {} -ad_proc lors::community_id { +ad_proc lors::get_community_id { -node_id } { if { ![info exists node_id] } {