Index: openacs-4/packages/acs-subsite/www/shared/parameters.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/shared/parameters.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/www/shared/parameters.xql	24 Feb 2010 01:20:15 -0000	1.2
+++ openacs-4/packages/acs-subsite/www/shared/parameters.xql	3 Apr 2010 23:13:47 -0000	1.3
@@ -2,13 +2,29 @@
 
 <queryset>
 
+  <fullquery name="select_pretty_name">
+    <querytext>
+      select pretty_name as instance_name
+      from   apm_package_types
+      where  package_key = :package_key
+    </querytext>
+  </fullquery>
+
+  <fullquery name="select_instance_name">
+    <querytext>
+      select instance_name, package_key
+      from   apm_packages
+      where  package_id = :package_id
+    </querytext>
+  </fullquery>
+
   <fullquery name="section_where_clause">
     <querytext>
       and section_name=:section
     </querytext>
   </fullquery>
 
-  <fullquery name="select_params">      
+  <fullquery name="select_instance_params">      
     <querytext>
       select p.parameter_name,
         coalesce(p.description, 'No Description') as description,
@@ -21,23 +37,58 @@
          where v.package_id = :package_id) v
         on p.parameter_id = v.parameter_id
       where p.package_key = :package_key
+        and p.scope = 'instance'
 	$section_where_clause
       order  by section_name, parameter_name
     </querytext>
   </fullquery>
 
-  <fullquery name="select_params_set">      
+  <fullquery name="select_global_params">      
     <querytext>
+      select p.parameter_name,
+        coalesce(p.description, 'No Description') as description,
+        v.attr_value,
+        coalesce(p.section_name, '') as section_name,
+        p.datatype
+      from apm_parameters p left outer join
+        (select v.parameter_id, v.attr_value
+         from apm_parameter_values v
+         where v.package_id is null) v
+        on p.parameter_id = v.parameter_id
+      where p.package_key = :package_key
+        and p.scope = 'global'
+	$section_where_clause
+      order  by section_name, parameter_name
+    </querytext>
+  </fullquery>
+
+  <fullquery name="select_instance_params_set">      
+    <querytext>
       select p.parameter_name as c__parameter_name
       from apm_parameters p left outer join
         (select v.parameter_id, v.attr_value
          from apm_parameter_values v
          where v.package_id = :package_id) v
         on p.parameter_id = v.parameter_id
       where p.package_key = :package_key
+        and p.scope = 'instance'
       $section_where_clause
     </querytext>
   </fullquery>
 
+  <fullquery name="select_global_params_set">      
+    <querytext>
+      select p.parameter_name as c__parameter_name
+      from apm_parameters p left outer join
+        (select v.parameter_id, v.attr_value
+         from apm_parameter_values v
+         where v.package_id is null) v
+        on p.parameter_id = v.parameter_id
+      where p.package_key = :package_key
+        and p.scope = 'global'
+      $section_where_clause
+    </querytext>
+  </fullquery>
+
 </queryset>