Index: openacs-4/packages/acs-tcl/tcl/apm-xml-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-xml-procs.xql,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-tcl/tcl/apm-xml-procs.xql	9 May 2001 22:32:25 -0000	1.3
+++ openacs-4/packages/acs-tcl/tcl/apm-xml-procs.xql	23 Jan 2003 17:55:24 -0000	1.4
@@ -4,9 +4,16 @@
 <fullquery name="apm_generate_package_spec.package_version_select">      
       <querytext>
       
-        select t.package_key, t.package_uri, t.pretty_name, t.pretty_plural, t.package_type,
-	t.initial_install_p, t.singleton_p, v.*
-        from   apm_package_versions v, apm_package_types t
+        select t.package_key, 
+               t.package_uri, 
+               t.pretty_name, 
+               t.pretty_plural, 
+               t.package_type,
+	       t.initial_install_p, 
+               t.singleton_p, 
+               v.*
+        from   apm_package_versions v, 
+               apm_package_types t
         where  v.version_id = :version_id
         and    v.package_key = t.package_key
     
@@ -18,8 +25,9 @@
       <querytext>
       
         select distinct db_type
-        from apm_package_files
-        where db_type is not null
+        from   apm_package_files
+        where  db_type is not null
+        order  by db_type
     
       </querytext>
 </fullquery>
@@ -31,7 +39,7 @@
         select owner_uri, owner_name
         from   apm_package_owners
         where  version_id = :version_id
-        order by sort_key
+        order  by sort_key, owner_uri
     
       </querytext>
 </fullquery>
@@ -40,7 +48,9 @@
 <fullquery name="apm_generate_package_spec.dependency_info">      
       <querytext>
       
-        select dependency_type, service_uri, service_version
+        select dependency_type, 
+               service_uri, 
+               service_version
         from   apm_package_dependencies
         where  version_id = :version_id
         order by dependency_type, service_uri
@@ -51,20 +61,41 @@
  
 <fullquery name="apm_generate_package_spec.version_path">      
       <querytext>
-      select path, file_type, db_type from apm_package_files where version_id = :version_id order by path
+
+        select path, 
+               file_type, 
+               db_type 
+        from   apm_package_files 
+        where  version_id = :version_id 
+        order  by path
+
       </querytext>
 </fullquery>
 
+<fullquery name="apm_generate_package_spec.callback_info">      
+      <querytext>
+        select type,
+               proc
+        from apm_package_callbacks
+        where version_id = :version_id
+      </querytext>
+</fullquery>
  
 <fullquery name="apm_generate_package_spec.parameter_info">      
       <querytext>
       
-	select parameter_name, description, datatype, section_name, default_value, min_n_values, max_n_values
-	  from apm_parameters
-	 where package_key = :package_key
+	select parameter_name, 
+               description, 
+               datatype, 
+               section_name, 
+               default_value, 
+               min_n_values, 
+               max_n_values
+        from   apm_parameters
+	where  package_key = :package_key
+        order  by parameter_name
     
       </querytext>
 </fullquery>
 
- 
 </queryset>