Index: openacs-4/packages/acs-subsite/www/admin/site-map/parameter-set-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/Attic/parameter-set-oracle.xql,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-subsite/www/admin/site-map/parameter-set-oracle.xql 18 Nov 2001 12:07:09 -0000 1.3
+++ openacs-4/packages/acs-subsite/www/admin/site-map/parameter-set-oracle.xql 20 Nov 2001 17:46:28 -0000 1.4
@@ -17,14 +17,16 @@
-select p.parameter_id, p.parameter_name, p.package_key, nvl(p.description, 'No Description') description,
- nvl(v.attr_value, 'No Value') attr_value, nvl(p.section_name, 'No Section Name') section_name
- from apm_parameters p, (select parameter_id, attr_value
- from apm_parameter_values v
- where v.package_id = :package_id) v
- where p.parameter_id = v.parameter_id(+)
- and p.package_key = (select package_key from apm_packages where package_id = :package_id)
- $additional_sql
+select p.parameter_id, p.parameter_name, p.package_key,
+ nvl(p.description, 'No Description') description,
+ v.attr_value,
+ nvl(p.section_name, 'No Section Name') section_name
+from apm_parameters p, (select parameter_id, attr_value
+ from apm_parameter_values v
+ where v.package_id = :package_id) v
+where p.parameter_id = v.parameter_id(+)
+ and p.package_key = (select package_key from apm_packages where package_id = :package_id)
+$additional_sql
Index: openacs-4/packages/acs-subsite/www/admin/site-map/parameter-set-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/Attic/parameter-set-postgresql.xql,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-subsite/www/admin/site-map/parameter-set-postgresql.xql 18 Nov 2001 12:07:09 -0000 1.5
+++ openacs-4/packages/acs-subsite/www/admin/site-map/parameter-set-postgresql.xql 20 Nov 2001 17:46:28 -0000 1.6
@@ -17,14 +17,16 @@
-select p.parameter_id, p.parameter_name, p.package_key, coalesce(p.description, 'No Description') as description,
- coalesce(v.attr_value, 'No Value') as attr_value, coalesce(p.section_name, 'No Section Name') as section_name
- from apm_parameters p left outer join (select parameter_id, attr_value
+select p.parameter_id, p.parameter_name, p.package_key,
+ coalesce(p.description, 'No Description') as description,
+ v.attr_value,
+ coalesce(p.section_name, 'No Section Name') as section_name
+from apm_parameters p left outer join (select parameter_id, 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 = (select package_key from apm_packages where package_id = :package_id)
- $additional_sql
+where p.package_key = (select package_key from apm_packages where package_id = :package_id)
+$additional_sql
Index: openacs-4/packages/acs-subsite/www/admin/site-map/parameter-set.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/Attic/parameter-set.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-subsite/www/admin/site-map/parameter-set.tcl 18 Nov 2001 12:07:09 -0000 1.3
+++ openacs-4/packages/acs-subsite/www/admin/site-map/parameter-set.tcl 20 Nov 2001 17:46:28 -0000 1.4
@@ -36,6 +36,9 @@
ns_log Notice [ad_dimensional_sql $dimensional_list]
}
+# DRB: This should be rewritten to optionally allow for the definition of possible parameter values,
+# with a drop-down select widget used rather than a text input widget.
+
lappend table_def [list attr_value "Value" no_sort \
{
Index: openacs-4/packages/acs-tcl/tcl/defs-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/defs-procs.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-tcl/tcl/defs-procs.tcl 18 Nov 2001 12:07:09 -0000 1.4
+++ openacs-4/packages/acs-tcl/tcl/defs-procs.tcl 20 Nov 2001 17:46:28 -0000 1.5
@@ -498,11 +498,11 @@
ad_proc -private ad_parameter_cache {
- {
- -set ""
- -delete:boolean
- }
- package_id parameter_name} {
+ -set
+ -delete:boolean
+ package_id
+ parameter_name
+} {
Manages the cache for ad_paremeter.
@param -set Use this flag to indicate a value to set in the cache.
@@ -517,7 +517,7 @@
}
return
}
- if {![empty_string_p $set] } {
+ if {[info exists set]} {
ns_log Notice "Caching $parameter_name for $package_id to $set"
nsv_set "ad_param_$package_id" $parameter_name $set
return $set
|