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.5 -r1.6 --- openacs-4/packages/acs-tcl/tcl/apm-procs-oracle.xql 12 May 2002 20:57:02 -0000 1.5 +++ openacs-4/packages/acs-tcl/tcl/apm-procs-oracle.xql 27 Jul 2002 00:13:17 -0000 1.6 @@ -53,7 +53,8 @@ - select v.package_id, p.parameter_name, nvl(p.default_value, v.attr_value) as attr_value + select v.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 and p.parameter_id = v.parameter_id (+) 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.4 -r1.5 --- openacs-4/packages/acs-tcl/tcl/apm-procs.xql 29 May 2001 01:46:29 -0000 1.4 +++ openacs-4/packages/acs-tcl/tcl/apm-procs.xql 27 Jul 2002 00:13:17 -0000 1.5 @@ -45,7 +45,7 @@ select v.package_id, p.parameter_name, - coalesce(p.default_value, v.attr_value) as attr_value + 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