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.5 -r1.6 --- openacs-4/packages/acs-subsite/www/admin/site-map/parameter-set-oracle.xql 21 Jun 2002 19:08:33 -0000 1.5 +++ openacs-4/packages/acs-subsite/www/admin/site-map/parameter-set-oracle.xql 22 Nov 2017 15:05:31 -0000 1.6 @@ -12,23 +12,4 @@ - - - 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 v.parameter_id, - v.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.7 -r1.8 --- openacs-4/packages/acs-subsite/www/admin/site-map/parameter-set-postgresql.xql 21 Jun 2002 19:08:33 -0000 1.7 +++ openacs-4/packages/acs-subsite/www/admin/site-map/parameter-set-postgresql.xql 22 Nov 2017 15:05:31 -0000 1.8 @@ -12,23 +12,4 @@ - - - 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 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 = (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.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/Attic/parameter-set.xql,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/acs-subsite/www/admin/site-map/parameter-set.xql 22 Nov 2017 15:05:31 -0000 1.1 @@ -0,0 +1,23 @@ + + + + + + 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 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 = (select package_key from apm_packages where package_id = :package_id) + $additional_sql + + + + Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/acs-subsite/www/admin/attributes/enum-add-2-oracle.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.3 refers to a dead (removed) revision in file `openacs-4/packages/acs-subsite/www/admin/attributes/enum-add-2-postgresql.xql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/acs-subsite/www/admin/attributes/enum-add-2.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/attributes/enum-add-2.xql,v diff -u -r1.2 -r1.3 --- openacs-4/packages/acs-subsite/www/admin/attributes/enum-add-2.xql 19 Aug 2001 16:32:14 -0000 1.2 +++ openacs-4/packages/acs-subsite/www/admin/attributes/enum-add-2.xql 22 Nov 2017 15:11:10 -0000 1.3 @@ -34,5 +34,20 @@ + + + + + insert into acs_enum_values + (attribute_id, sort_order, enum_value, pretty_name) + select :attribute_id, :sort_order, :pretty_name, :pretty_name + + where not exists (select 1 + from acs_enum_values v2 + where v2.pretty_name = :pretty_name + and v2.attribute_id = :attribute_id) + + +