Index: openacs-4/packages/acs-tcl/tcl/apm-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-procs.xql,v
diff -u -r1.28 -r1.29
--- openacs-4/packages/acs-tcl/tcl/apm-procs.xql	31 Mar 2010 00:46:16 -0000	1.28
+++ openacs-4/packages/acs-tcl/tcl/apm-procs.xql	7 Aug 2017 23:47:59 -0000	1.29
@@ -20,18 +20,6 @@
     </querytext>
   </fullquery>
 
-  <fullquery name="apm_package_list_search_order.get_dependencies">
-    <querytext>
-      select apd.service_uri
-      from apm_package_versions apv, apm_package_dependencies apd
-      where apv.package_key = :package_key
-        and apv.installed_p = 't'
-        and apd.version_id = apv.version_id
-        and apd.dependency_type in ('extends', 'embeds')
-      order by apd.dependency_id
-    </querytext>
-  </fullquery>
-
   <fullquery name="apm_package_list_url_resolution.get_inherit_templates_p">
     <querytext>
       select inherit_templates_p
@@ -126,14 +114,6 @@
     </querytext>
   </fullquery>
   
-  <fullquery name="apm_package_installed_p_not_cached.apm_package_installed_p">      
-    <querytext>
-      select 1 from apm_package_versions
-      where package_key = :package_key
-      and installed_p = 't'
-    </querytext>
-  </fullquery>
-
   <fullquery name="apm_package_enabled_p.apm_package_enabled_p">      
     <querytext>
       select 1 from apm_package_versions
@@ -206,14 +186,22 @@
     </querytext>
   </fullquery>
 
-  <fullquery name="apm_version_id_from_package_key.get_id">      
+  <fullquery name="apm_version_id_from_package_key.get_enabled_id">      
     <querytext>
         select version_id 
         from apm_enabled_package_versions 
         where package_key = :package_key
     </querytext>
   </fullquery>
   
+  <fullquery name="apm_version_id_from_package_key.get_id">      
+    <querytext>
+        select version_id 
+        from apm_package_versions 
+        where package_key = :package_key
+    </querytext>
+  </fullquery>
+  
   <fullquery name="apm_package_id_from_key_mem.apm_package_id_from_key">      
     <querytext>
       select package_id