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 -N -r1.3 -r1.4
--- openacs-4/packages/acs-subsite/www/shared/parameters.xql	3 Apr 2010 23:13:47 -0000	1.3
+++ openacs-4/packages/acs-subsite/www/shared/parameters.xql	4 Apr 2010 14:51:47 -0000	1.4
@@ -24,7 +24,7 @@
     </querytext>
   </fullquery>
 
-  <fullquery name="select_instance_params">      
+  <fullquery name="select_params">      
     <querytext>
       select p.parameter_name,
         coalesce(p.description, 'No Description') as description,
@@ -34,61 +34,28 @@
       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
+         where (v.package_id = :package_id or v.package_id is null)) v
         on p.parameter_id = v.parameter_id
       where p.package_key = :package_key
-        and p.scope = 'instance'
+        and p.scope = :scope
 	$section_where_clause
       order  by section_name, parameter_name
     </querytext>
   </fullquery>
 
-  <fullquery name="select_global_params">      
+  <fullquery name="select_params_set">      
     <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
+         where (v.package_id = :package_id or v.package_id is null)) v
         on p.parameter_id = v.parameter_id
       where p.package_key = :package_key
-        and p.scope = 'instance'
+        and p.scope = :scope
       $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>