From: Dan Scott Date: Wed, 25 May 2011 01:56:13 +0000 (-0400) Subject: Trivial line-wrapping patch for call number class defaults X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=62e75063ded3061c9c1ad49c346ed13a8ae3d12b;p=evergreen%2Fpines.git Trivial line-wrapping patch for call number class defaults Signed-off-by: Dan Scott --- diff --git a/Open-ILS/src/sql/Pg/040.schema.asset.sql b/Open-ILS/src/sql/Pg/040.schema.asset.sql index f335713e1f..735cc64050 100644 --- a/Open-ILS/src/sql/Pg/040.schema.asset.sql +++ b/Open-ILS/src/sql/Pg/040.schema.asset.sql @@ -201,7 +201,14 @@ BEGIN sortkey := NEW.label_sortkey; IF NEW.label_class IS NULL THEN - NEW.label_class := COALESCE( (SELECT substring(value from E'\\d+')::integer from actor.org_unit_setting WHERE name = 'cat.default_classification_scheme' AND org_unit = NEW.owning_lib), 1 ); + NEW.label_class := COALESCE( + ( + SELECT substring(value from E'\\d+')::integer + FROM actor.org_unit_setting + WHERE name = 'cat.default_classification_scheme' + AND org_unit = NEW.owning_lib + ), 1 + ); END IF; EXECUTE 'SELECT ' || acnc.normalizer || '(' || diff --git a/Open-ILS/src/sql/Pg/upgrade/0541.schema.call_number_honor_default_class.sql b/Open-ILS/src/sql/Pg/upgrade/0541.schema.call_number_honor_default_class.sql index 32be6a3c1e..9b6f5c9d2e 100644 --- a/Open-ILS/src/sql/Pg/upgrade/0541.schema.call_number_honor_default_class.sql +++ b/Open-ILS/src/sql/Pg/upgrade/0541.schema.call_number_honor_default_class.sql @@ -11,7 +11,14 @@ BEGIN sortkey := NEW.label_sortkey; IF NEW.label_class IS NULL THEN - NEW.label_class := COALESCE( (SELECT substring(value from E'\\d+')::integer from actor.org_unit_setting WHERE name = 'cat.default_classification_scheme' AND org_unit = NEW.owning_lib), 1); + NEW.label_class := COALESCE( + ( + SELECT substring(value from E'\\d+')::integer + FROM actor.org_unit_setting + WHERE name = 'cat.default_classification_scheme' + AND org_unit = NEW.owning_lib + ), 1 + ); END IF; EXECUTE 'SELECT ' || acnc.normalizer || '(' ||