Index: openacs-4/packages/ams/tcl/ams-list-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ams/tcl/ams-list-procs.tcl,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/ams/tcl/ams-list-procs.tcl	23 Feb 2006 23:39:51 -0000	1.11
+++ openacs-4/packages/ams/tcl/ams-list-procs.tcl	13 Mar 2006 04:19:14 -0000	1.12
@@ -219,7 +219,7 @@
 	return $existing_list_id
     } else {
 	if { [empty_string_p $context_id] } {
-	    set context_id [ams::package_id]
+	    set context_id [apm_package_id_from_key ams]
 	}
 	if { ![exists_and_not_null description] } {
 	    set description_mime_type ""
Index: openacs-4/packages/ams/tcl/ams-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ams/tcl/ams-procs-postgresql.xql,v
diff -u -r1.22 -r1.23
--- openacs-4/packages/ams/tcl/ams-procs-postgresql.xql	20 Feb 2006 10:43:52 -0000	1.22
+++ openacs-4/packages/ams/tcl/ams-procs-postgresql.xql	13 Mar 2006 04:19:14 -0000	1.23
@@ -41,7 +41,7 @@
   <querytext>
         select attribute_id
           from acs_attributes
-         where object_type = :object_type
+         where object_type in ([ams::object_parents -sql -show_root -object_type $object_type])
            and attribute_name = :attribute_name
   </querytext>
 </fullquery>
Index: openacs-4/packages/ams/tcl/ams-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ams/tcl/ams-procs.tcl,v
diff -u -r1.43 -r1.44
--- openacs-4/packages/ams/tcl/ams-procs.tcl	12 Mar 2006 14:45:23 -0000	1.43
+++ openacs-4/packages/ams/tcl/ams-procs.tcl	13 Mar 2006 04:19:14 -0000	1.44
@@ -116,25 +116,12 @@
     -object_type:required
     -attribute_name:required
 } {
-    return the attribute_id for the specified attribute
+    return the attribute_id for the specified attribute, this proc checks
+    all parent attributes as well
 } {
-    # Special case for emails
-    if {$attribute_name eq "email"} {
-	set object_type "party"
-    }
     return [db_string get_attribute_id {} -default {}]
 }
 
-ad_proc -public ams::package_id {
-} {
-TODO: Get the AMS package ID, not the connection package_id
-    Get the package_id of the ams instance
-
-@return package_id
-} {
-    return [ad_conn package_id]
-}
-
 ad_proc -public ams::util::edit_lang_key_url {
     -message:required
     {-package_key "acs-translations"}