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.30 -r1.31
--- openacs-4/packages/acs-tcl/tcl/apm-procs.xql	14 May 2018 15:14:11 -0000	1.30
+++ openacs-4/packages/acs-tcl/tcl/apm-procs.xql	3 Sep 2024 15:37:34 -0000	1.31
@@ -73,152 +73,109 @@
     </querytext>
   </fullquery>
 
-  <fullquery name="apm_parameter_register.apm_parameter_cache_update">      
+  <fullquery name="apm_enabled_packages.enabled_packages">
     <querytext>
-      select coalesce(v.package_id, 0) as package_id, p.parameter_name, 
-      case when v.value_id is null then p.default_value else v.attr_value end as attr_value
-      from apm_parameters p left outer join apm_parameter_values v
-      using (parameter_id)
-      where p.package_key = :package_key
-    </querytext>
-  </fullquery>
-
-  <fullquery name="apm_enabled_packages.enabled_packages">      
-    <querytext>
       select distinct package_key
       from apm_package_versions
       where enabled_p='t'
       order by package_key
     </querytext>
   </fullquery>
-  
-  <fullquery name="apm_package_parameters.get_names">      
+
+  <fullquery name="apm_package_parameters.get_names">
     <querytext>
       select parameter_name from apm_parameters
       where package_key = :package_key
     </querytext>
   </fullquery>
-  
-  <fullquery name="apm_package_registered_p.apm_package_registered_p">      
+
+  <fullquery name="apm_package_registered_p.apm_package_registered_p">
     <querytext>
-      select 1 from apm_package_types 
+      select 1 from apm_package_types
       where package_key = :package_key
     </querytext>
   </fullquery>
-  
-  <fullquery name="apm_package_enabled_p.apm_package_enabled_p">      
+
+  <fullquery name="apm_version_installed_p.apm_version_installed_p">
     <querytext>
       select 1 from apm_package_versions
-      where package_key = :package_key
-      and enabled_p = 't'
-    </querytext>
-  </fullquery>
-  
-  <fullquery name="apm_version_installed_p.apm_version_installed_p">      
-    <querytext>
-      select 1 from apm_package_versions
       where version_id = :version_id
       and installed_p = 't'
     </querytext>
   </fullquery>
-  
-  <fullquery name="apm_parameter_update.parameter_update">      
+
+  <fullquery name="apm_parameter_update.parameter_update">
     <querytext>
-      update apm_parameters 
+      update apm_parameters
       set parameter_name = :parameter_name,
       default_value  = :default_value,
-      datatype       = :datatype, 
+      datatype       = :datatype,
       description	   = :description,
       section_name   = :section_name,
       min_n_values   = :min_n_values,
       max_n_values   = :max_n_values
       where parameter_id = :parameter_id
     </querytext>
   </fullquery>
-  
-  <fullquery name="apm_parameter_update.object_title_update">      
+
+  <fullquery name="apm_parameter_update.object_title_update">
     <querytext>
 	update acs_objects
 	set title = :parameter_name
 	where object_id = :parameter_id
     </querytext>
   </fullquery>
-  
-  <fullquery name="apm_parameter_unregister.select_parameter_id">      
+
+  <fullquery name="apm_parameter_unregister.all_parameters_packages">
     <querytext>
-      select parameter_id
-      from apm_parameters
-      where package_key = :package_key
-        and parameter_name = :parameter
-    </querytext>
-  </fullquery>
-  
-  <fullquery name="apm_parameter_unregister.get_scope_and_name">      
-    <querytext>
-      select scope, parameter_name
-      from apm_parameters
-      where parameter_id = :parameter_id
-    </querytext>
-  </fullquery>
-  
-  <fullquery name="apm_parameter_unregister.all_parameters_packages">      
-    <querytext>
-      select package_id, parameter_id, parameter_name 
+      select package_id, parameter_id, parameter_name
       from apm_packages p, apm_parameters ap
       where p.package_key = ap.package_key
       and ap.parameter_id = :parameter_id
     </querytext>
   </fullquery>
-  
-  <fullquery name="apm_package_key_from_id_mem.apm_package_key_from_id">      
-    <querytext>
-      select package_key
-      from apm_packages
-      where package_id = :package_id
-    </querytext>
-  </fullquery>
 
-  <fullquery name="apm_version_id_from_package_key.get_enabled_id">      
+  <fullquery name="apm_version_id_from_package_key.get_enabled_id">
     <querytext>
-        select version_id 
-        from apm_enabled_package_versions 
+        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">      
+
+  <fullquery name="apm_version_id_from_package_key.get_id">
     <querytext>
-        select version_id 
-        from apm_package_versions 
+        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">      
+
+  <fullquery name="apm_package_id_from_key_mem.apm_package_id_from_key">
     <querytext>
       select package_id
       from apm_packages
       where package_key = :package_key
     </querytext>
   </fullquery>
-  
-  <fullquery name="apm_version_info.apm_package_by_version_id">      
+
+  <fullquery name="apm_version_info.apm_package_by_version_id">
     <querytext>
       select pretty_name, version_name, package_key, installed_p, distribution_uri, tagged_p
       from   apm_package_version_info
       where  version_id = :version_id
     </querytext>
   </fullquery>
 
-  <fullquery name="apm_package_rename.nodes_to_sync">      
+  <fullquery name="apm_package_rename.nodes_to_sync">
     <querytext>
       select node_id
       from site_nodes
       where object_id = :package_id
     </querytext>
   </fullquery>
-  
-  <fullquery name="apm_parameter_sync.apm_parameter_names_and_values">      
+
+  <fullquery name="apm_parameter_sync.apm_parameter_names_and_values">
     <querytext>
       select parameter_name, attr_value
       from apm_parameters p, apm_parameter_values v, apm_packages a
@@ -229,7 +186,7 @@
     </querytext>
   </fullquery>
 
-  <fullquery name="apm_get_callback_proc.select_proc">      
+  <fullquery name="apm_get_callback_proc.select_proc">
     <querytext>
         select proc
         from apm_package_callbacks
@@ -238,34 +195,34 @@
     </querytext>
   </fullquery>
 
-  <fullquery name="apm_set_callback_proc.insert_proc">      
+  <fullquery name="apm_set_callback_proc.insert_proc">
     <querytext>
         insert into apm_package_callbacks
           (version_id, type, proc)
         values (:version_id, :type, :proc)
     </querytext>
-  </fullquery>  
+  </fullquery>
 
-  <fullquery name="apm_set_callback_proc.update_proc">      
+  <fullquery name="apm_set_callback_proc.update_proc">
     <querytext>
         update apm_package_callbacks
                 set proc = :proc
         where version_id = :version_id
           and type = :type
     </querytext>
-  </fullquery>  
+  </fullquery>
 
-  <fullquery name="apm_remove_callback_proc.delete_proc">      
+  <fullquery name="apm_remove_callback_proc.delete_proc">
     <querytext>
         delete from apm_package_callbacks
-        where version_id = (select version_id 
-                            from apm_enabled_package_versions 
+        where version_id = (select version_id
+                            from apm_enabled_package_versions
                             where package_key = :package_key)
         and   type = :type
     </querytext>
-  </fullquery>  
+  </fullquery>
 
-  <fullquery name="apm_version_get.select_version_info">      
+  <fullquery name="apm_version_get.select_version_info">
     <querytext>
         select v.version_id,
                v.package_key,
@@ -297,50 +254,50 @@
         where  v.version_id = :version_id
         and    t.package_key = v.package_key
     </querytext>
-  </fullquery>  
+  </fullquery>
 
-  <fullquery name="apm::get_package_descendent_options.get">      
+  <fullquery name="apm::get_package_descendent_options.get">
     <querytext>
       select pretty_name, package_key
       from apm_package_types
       where implements_subsite_p = 't'
         and package_key in ($in_clause)
       order by pretty_name
     </querytext>
-  </fullquery>  
+  </fullquery>
 
-  <fullquery name="apm::convert_type.update_package_key">      
+  <fullquery name="apm::convert_type.update_package_key">
     <querytext>
       update apm_packages
       set package_key = :new_package_key
       where package_id = :package_id
     </querytext>
-  </fullquery>  
+  </fullquery>
 
-  <fullquery name="apm::convert_type.get_params">      
+  <fullquery name="apm::convert_type.get_params">
     <querytext>
       select parameter_name, parameter_id
       from apm_parameters
       where package_key = :old_package_key
     </querytext>
-  </fullquery>  
+  </fullquery>
 
-  <fullquery name="apm::convert_type.get_new_parameter_id">      
+  <fullquery name="apm::convert_type.get_new_parameter_id">
     <querytext>
       select parameter_id as new_parameter_id
       from apm_parameters
       where package_key = :new_package_key
         and parameter_name = :parameter_name
     </querytext>
-  </fullquery>  
+  </fullquery>
 
-  <fullquery name="apm::convert_type.update_param">      
+  <fullquery name="apm::convert_type.update_param">
     <querytext>
       update apm_parameter_values
       set parameter_id = :new_parameter_id
       where parameter_id = :parameter_id
         and package_id = :package_id
     </querytext>
-  </fullquery>  
+  </fullquery>
 
 </queryset>