Index: openacs-4/packages/acs-tcl/tcl/apm-procs-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-procs-oracle.xql,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/acs-tcl/tcl/apm-procs-oracle.xql	27 Jul 2002 00:13:17 -0000	1.6
+++ openacs-4/packages/acs-tcl/tcl/apm-procs-oracle.xql	14 Sep 2002 16:29:30 -0000	1.7
@@ -167,7 +167,7 @@
   </querytext>
 </fullquery>
 
-<fullquery name="apm_package_url_from_key_mem.apm_package_url_from_key">      
+<fullquery name="apm_package_url_from_id_mem.apm_package_url_from_id">      
       <querytext>
       
 	select site_node.url(node_id) 
Index: openacs-4/packages/acs-tcl/tcl/apm-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-procs-postgresql.xql,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/acs-tcl/tcl/apm-procs-postgresql.xql	12 May 2002 20:57:02 -0000	1.8
+++ openacs-4/packages/acs-tcl/tcl/apm-procs-postgresql.xql	14 Sep 2002 16:29:30 -0000	1.9
@@ -139,7 +139,7 @@
 </fullquery>
 
 
-<fullquery name="apm_package_url_from_key_mem.apm_package_url_from_key">      
+<fullquery name="apm_package_url_from_id_mem.apm_package_url_from_id">      
       <querytext>
       
 	select site_node__url(node_id) 
Index: openacs-4/packages/acs-tcl/tcl/apm-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-procs.tcl,v
diff -u -r1.22 -r1.23
--- openacs-4/packages/acs-tcl/tcl/apm-procs.tcl	28 Aug 2002 13:25:23 -0000	1.22
+++ openacs-4/packages/acs-tcl/tcl/apm-procs.tcl	14 Sep 2002 16:29:30 -0000	1.23
@@ -742,6 +742,10 @@
     }
 }
 
+#
+# package_id -> package_key
+#
+
 ad_proc -public apm_package_key_from_id {package_id} {
     @return The package key of the instance.
 } {
@@ -754,6 +758,10 @@
     } -default ""]
 }
 
+#
+# package_key -> package_id
+#
+
 ad_proc -public apm_package_id_from_key {package_key} {
     @return The package id of the instance of the package.
     0 if no instance exists, error if several instances exist.
@@ -767,22 +775,41 @@
     } -default 0]
 }
 
-ad_proc -public apm_package_url_from_key {package_key} {
+#
+# package_id -> package_url
+#
+
+ad_proc -public apm_package_url_from_id {package_id} {
     @return The package url of the instance of the package.
     only valid for singleton packages.
 } {
-    return [util_memoize "apm_package_url_from_key_mem $package_key"]
+    return [util_memoize "apm_package_url_from_id_mem $package_id"]
 }
 
-ad_proc -public apm_package_url_from_key_mem {package_key} {
-    set package_id [apm_package_id_from_key $package_key]
-    return [db_string apm_package_url_from_key {
+ad_proc -public apm_package_url_from_id_mem {package_id} {
+    return [db_string apm_package_url_from_id {
 	select site_node.url(node_id) 
           from site_nodes 
          where object_id = :package_id
     } -default ""]
 }
 
+#
+# package_key -> package_url
+#
+
+ad_proc -public apm_package_url_from_key {package_key} {
+    @return The package url of the instance of the package.
+    only valid for singleton packages.
+} {
+    return [util_memoize "apm_package_url_from_key_mem $package_key"]
+}
+
+ad_proc -public apm_package_url_from_key_mem {package_key} {
+    set package_id [apm_package_id_from_key $package_key]
+    return [apm_package_url_from_id $package_id]
+}
+
 ad_proc -public apm_version_info {version_id} {
 
     Sets a set of common package information in the caller's environment.