Index: openacs-4/packages/dotlrn-catalog/tcl/dotlrn-catalog-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-catalog/tcl/dotlrn-catalog-procs.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/dotlrn-catalog/tcl/dotlrn-catalog-procs.tcl	16 Feb 2005 22:21:30 -0000	1.2
+++ openacs-4/packages/dotlrn-catalog/tcl/dotlrn-catalog-procs.tcl	22 Feb 2005 14:54:40 -0000	1.3
@@ -174,7 +174,6 @@
     @creation_user@  The user_id of the user that creates the course_id
 } {
     permission::grant -party_id $party_id -object_id $object_id  -privilege "admin"
-    set asm_package_id [apm_package_id_from_key assessment]
 
     db_foreach assessment { } {
     	if {[permission::permission_p -party_id $creation_user -object_id $assessment_id -privilege "admin"] == 1} {
@@ -195,7 +194,6 @@
     @creation_user@  The user_id of the user that creates the course_id
 } {
     permission::revoke -party_id $party_id -object_id $object_id  -privilege "admin"
-    set asm_package_id [apm_package_id_from_key assessment]
     
     db_foreach assessment { } {
 	if { [permission::permission_p -party_id $creation_user -object_id $assessment_id -privilege admin] == 1 } {
Index: openacs-4/packages/dotlrn-catalog/tcl/dotlrn-catalog-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-catalog/tcl/dotlrn-catalog-procs.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/dotlrn-catalog/tcl/dotlrn-catalog-procs.xql	16 Feb 2005 22:21:30 -0000	1.2
+++ openacs-4/packages/dotlrn-catalog/tcl/dotlrn-catalog-procs.xql	22 Feb 2005 14:54:40 -0000	1.3
@@ -100,7 +100,7 @@
             select ci.item_id as assessment_id from
             cr_folders cf, cr_items ci, cr_revisions cr, as_assessments a
             where cr.revision_id = ci.latest_revision and a.assessment_id = cr.revision_id and
-            ci.parent_id = cf.folder_id and cf.package_id = :asm_package_id 
+            ci.parent_id = cf.folder_id 
       </querytext>
 </fullquery>
 
@@ -109,7 +109,7 @@
             select ci.item_id as assessment_id from
             cr_folders cf, cr_items ci, cr_revisions cr, as_assessments a
             where cr.revision_id = ci.latest_revision and a.assessment_id = cr.revision_id and
-            ci.parent_id = cf.folder_id and cf.package_id = :asm_package_id 
+            ci.parent_id = cf.folder_id 
       </querytext>
 </fullquery>
 
Index: openacs-4/packages/dotlrn-catalog/www/course-info.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-catalog/www/course-info.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/dotlrn-catalog/www/course-info.tcl	14 Feb 2005 22:46:11 -0000	1.1
+++ openacs-4/packages/dotlrn-catalog/www/course-info.tcl	22 Feb 2005 14:54:40 -0000	1.2
@@ -12,7 +12,6 @@
 set context [list "[_ dotlrn-catalog.one_course_info]"]
 
 set return_url "index"
-set asm_package_id [apm_package_id_from_key assessment]
 
 db_1row get_course_info { } 
 
Index: openacs-4/packages/dotlrn-catalog/www/course-info.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-catalog/www/course-info.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/dotlrn-catalog/www/course-info.xql	14 Feb 2005 22:46:11 -0000	1.1
+++ openacs-4/packages/dotlrn-catalog/www/course-info.xql	22 Feb 2005 14:54:40 -0000	1.2
@@ -14,8 +14,7 @@
             select cr.title from
             cr_folders cf, cr_items ci, cr_revisions cr, as_assessments a
             where cr.revision_id = ci.latest_revision and a.assessment_id = cr.revision_id and
-            ci.parent_id = cf.folder_id and cf.package_id = :asm_package_id and
-            ci.item_id = :assessment_id order by cr.title
+            ci.parent_id = cf.folder_id and ci.item_id = :assessment_id order by cr.title
       </querytext>
 </fullquery>
 
Index: openacs-4/packages/dotlrn-catalog/www/dt-admin/course-add-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-catalog/www/dt-admin/course-add-edit.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/dotlrn-catalog/www/dt-admin/course-add-edit.tcl	16 Feb 2005 22:21:30 -0000	1.5
+++ openacs-4/packages/dotlrn-catalog/www/dt-admin/course-add-edit.tcl	22 Feb 2005 14:54:40 -0000	1.6
@@ -37,7 +37,6 @@
 }
 
 # Get assessments
-set asm_package_id [apm_package_id_from_key assessment]
 set asm_list [list [list "[_ dotlrn-catalog.not_associate]" "-1"]]
 db_foreach assessment { } {
     if { [permission::permission_p -object_id $assessment_id -privilege "admin"] == 1 } {
Index: openacs-4/packages/dotlrn-catalog/www/dt-admin/course-add-edit.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-catalog/www/dt-admin/course-add-edit.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/dotlrn-catalog/www/dt-admin/course-add-edit.xql	14 Feb 2005 22:46:11 -0000	1.1
+++ openacs-4/packages/dotlrn-catalog/www/dt-admin/course-add-edit.xql	22 Feb 2005 14:54:40 -0000	1.2
@@ -6,7 +6,7 @@
       	    select cr.title ,ci.item_id as assessment_id from 
             cr_folders cf, cr_items ci, cr_revisions cr, as_assessments a 
             where cr.revision_id = ci.latest_revision and a.assessment_id = cr.revision_id and 
-            ci.parent_id = cf.folder_id and cf.package_id = :asm_package_id order by cr.title
+            ci.parent_id = cf.folder_id order by cr.title
       </querytext>
 </fullquery>
 
@@ -21,8 +21,7 @@
       	    select cr.title from 
             cr_folders cf, cr_items ci, cr_revisions cr, as_assessments a 
             where cr.revision_id = ci.latest_revision and a.assessment_id = cr.revision_id and 
-            ci.parent_id = cf.folder_id and cf.package_id = :asm_package_id and
-	    ci.item_id = :assessment_id order by cr.title
+            ci.parent_id = cf.folder_id and ci.item_id = :assessment_id order by cr.title
       </querytext>
 </fullquery>
 
Index: openacs-4/packages/dotlrn-catalog/www/dt-admin/course-info.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-catalog/www/dt-admin/course-info.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/dotlrn-catalog/www/dt-admin/course-info.tcl	16 Feb 2005 22:21:30 -0000	1.2
+++ openacs-4/packages/dotlrn-catalog/www/dt-admin/course-info.tcl	22 Feb 2005 14:54:40 -0000	1.3
@@ -23,9 +23,6 @@
 
 set page_title "$course_key [_ dotlrn-catalog.course_info]"
 
-
-set asm_package_id [apm_package_id_from_key assessment]
-
 db_1row get_course_info { } 
 
 set asm_name [db_string get_asm_name { } -default "[_ dotlrn-catalog.not_associated]"]
Index: openacs-4/packages/dotlrn-catalog/www/dt-admin/course-info.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-catalog/www/dt-admin/course-info.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/dotlrn-catalog/www/dt-admin/course-info.xql	16 Feb 2005 00:22:46 -0000	1.1
+++ openacs-4/packages/dotlrn-catalog/www/dt-admin/course-info.xql	22 Feb 2005 14:54:40 -0000	1.2
@@ -14,8 +14,7 @@
             select cr.title from
             cr_folders cf, cr_items ci, cr_revisions cr, as_assessments a
             where cr.revision_id = ci.latest_revision and a.assessment_id = cr.revision_id and
-            ci.parent_id = cf.folder_id and cf.package_id = :asm_package_id and
-            ci.item_id = :assessment_id order by cr.title
+            ci.parent_id = cf.folder_id and ci.item_id = :assessment_id order by cr.title
       </querytext>
 </fullquery>
 
Index: openacs-4/packages/dotlrn-catalog/www/dt-admin/course-list.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-catalog/www/dt-admin/course-list.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/dotlrn-catalog/www/dt-admin/course-list.tcl	21 Feb 2005 19:22:13 -0000	1.5
+++ openacs-4/packages/dotlrn-catalog/www/dt-admin/course-list.tcl	22 Feb 2005 14:54:40 -0000	1.6
@@ -15,6 +15,7 @@
 
 set cc_package_id [apm_package_id_from_key "dotlrn-catalog"]
 
+
 permission::require_permission -party_id $user_id -object_id $cc_package_id -privilege "create"
 
 if {[permission::permission_p -party_id $user_id -object_id $cc_package_id -privilege "admin"]} {
@@ -31,9 +32,6 @@
     set tree_id ""
 }
 
-
-set asm_package_id [apm_package_id_from_key assessment]
-
 if { [acs_user::site_wide_admin_p] } {
     if { [info exist keyword] } {
 	set query get_course_info_site_wide_keyword
Index: openacs-4/packages/dotlrn-catalog/www/dt-admin/course-list.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-catalog/www/dt-admin/course-list.xql,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/dotlrn-catalog/www/dt-admin/course-list.xql	16 Feb 2005 22:21:30 -0000	1.3
+++ openacs-4/packages/dotlrn-catalog/www/dt-admin/course-list.xql	22 Feb 2005 14:54:40 -0000	1.4
@@ -45,8 +45,7 @@
             select cr.title from
             cr_folders cf, cr_items ci, cr_revisions cr, as_assessments a
             where cr.revision_id = ci.latest_revision and a.assessment_id = cr.revision_id and
-            ci.parent_id = cf.folder_id and cf.package_id = :asm_package_id and
-            ci.item_id = :assessment_id order by cr.title
+            ci.parent_id = cf.folder_id and ci.item_id = :assessment_id order by cr.title
       </querytext>
 </fullquery>
 
Index: openacs-4/packages/dotlrn-catalog/www/dt-admin/dotlrn-list.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-catalog/www/dt-admin/dotlrn-list.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/dotlrn-catalog/www/dt-admin/dotlrn-list.tcl	17 Feb 2005 22:56:10 -0000	1.2
+++ openacs-4/packages/dotlrn-catalog/www/dt-admin/dotlrn-list.tcl	22 Feb 2005 14:54:40 -0000	1.3
@@ -22,8 +22,6 @@
 
 set context [list [list course-list  "[_ dotlrn-catalog.course_list]"] "[_ dotlrn-catalog.dotlrn_list]"]
 
-set asm_package_id [apm_package_id_from_key assessment]
-
 db_multirow -extend { rel type } classes_list get_dotlrn_classes {} {
     set rel [dotlrn_catalog::relation_between -object_one $course_id -object_two $object_id]
     set type "class"
Index: openacs-4/packages/dotlrn-catalog/www/dt-admin/revision-list.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-catalog/www/dt-admin/revision-list.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/dotlrn-catalog/www/dt-admin/revision-list.tcl	14 Feb 2005 22:46:11 -0000	1.1
+++ openacs-4/packages/dotlrn-catalog/www/dt-admin/revision-list.tcl	22 Feb 2005 14:54:40 -0000	1.2
@@ -31,8 +31,6 @@
 
 set context [list [list "course-list"  "[_ dotlrn-catalog.course_list]"] "[_ dotlrn-catalog.rev_list]"]
 
-set asm_package_id [apm_package_id_from_key assessment]
-
 db_multirow -extend { asm_name rel } course_list get_course_info { } {
     set asm_name [db_string get_asm_name { } -default "[_ dotlrn-catalog.not_associated]"]
     set rel [dotlrn_catalog::has_relation -course_id $course_id]
Index: openacs-4/packages/dotlrn-catalog/www/dt-admin/revision-list.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-catalog/www/dt-admin/revision-list.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/dotlrn-catalog/www/dt-admin/revision-list.xql	14 Feb 2005 22:46:11 -0000	1.1
+++ openacs-4/packages/dotlrn-catalog/www/dt-admin/revision-list.xql	22 Feb 2005 14:54:40 -0000	1.2
@@ -15,8 +15,7 @@
             select cr.title from
             cr_folders cf, cr_items ci, cr_revisions cr, as_assessments a
             where cr.revision_id = ci.latest_revision and a.assessment_id = cr.revision_id and
-            ci.parent_id = cf.folder_id and cf.package_id = :asm_package_id and
-            ci.item_id = :assessment_id order by cr.title
+            ci.parent_id = cf.folder_id and ci.item_id = :assessment_id order by cr.title
       </querytext>
 </fullquery>