Index: openacs-4/packages/acs-tcl/tcl/apm-procs-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-procs-oracle.xql,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/acs-tcl/tcl/apm-procs-oracle.xql	1 Apr 2004 20:56:29 -0000	1.12
+++ openacs-4/packages/acs-tcl/tcl/apm-procs-oracle.xql	16 Jun 2004 01:34:24 -0000	1.13
@@ -65,7 +65,7 @@
 <fullquery name="apm_parameter_register.apm_parameter_cache_update">      
       <querytext>
       
-	select v.package_id, p.parameter_name,
+	select nvl(v.package_id, 0) as package_id, p.parameter_name,
           decode(v.value_id, null, p.default_value, v.attr_value) as attr_value
 	from apm_parameters p, apm_parameter_values v
 	where p.package_key = :package_key
Index: openacs-4/packages/acs-tcl/tcl/apm-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-procs.tcl,v
diff -u -r1.69 -r1.70
--- openacs-4/packages/acs-tcl/tcl/apm-procs.tcl	20 Apr 2004 21:13:04 -0000	1.69
+++ openacs-4/packages/acs-tcl/tcl/apm-procs.tcl	16 Jun 2004 01:34:24 -0000	1.70
@@ -799,10 +799,6 @@
 
     # Update the cache.
     db_foreach apm_parameter_cache_update {
-	select v.package_id, p.parameter_name, nvl(p.default_value, v.attr_value) as attr_value
-	from apm_parameters p, apm_parameter_values v
-	where p.package_key = :package_key
-	and p.parameter_id = v.parameter_id (+)
     } {
 	ad_parameter_cache -set $attr_value $package_id $parameter_name
     }
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.20 -r1.21
--- openacs-4/packages/acs-tcl/tcl/apm-procs.xql	12 Mar 2004 18:48:55 -0000	1.20
+++ openacs-4/packages/acs-tcl/tcl/apm-procs.xql	16 Jun 2004 01:34:24 -0000	1.21
@@ -11,7 +11,7 @@
 
   <fullquery name="apm_parameter_register.apm_parameter_cache_update">      
     <querytext>
-      select v.package_id, p.parameter_name, 
+      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)