From 76c80e1111a44820308112b69ace0de9081a03d8 Mon Sep 17 00:00:00 2001 From: Galen Charlton Date: Wed, 2 Mar 2016 18:05:13 -0500 Subject: [PATCH] LP#1371647: tweak pinned IDs Tweak an ID to avoid an overlap with the change for LP#1519055. Signed-off-by: Galen Charlton --- Open-ILS/src/sql/Pg/950.data.seed-values.sql | 8 ++++---- Open-ILS/src/sql/Pg/upgrade/XXXX.more_fixed_fields.sql | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Open-ILS/src/sql/Pg/950.data.seed-values.sql b/Open-ILS/src/sql/Pg/950.data.seed-values.sql index 0f63523027..1f515c30ea 100644 --- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql +++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql @@ -7534,7 +7534,7 @@ INSERT INTO config.coded_value_map (id, ctype, code, value, concept_uri) 'http://rdaregistry.info/termList/RDACarrierType/1002'); -- Accompanying Matter -INSERT INTO config.coded_value_map (id, ctype, code, value) VALUES (712, 'accm', ' ', oils_i18n_gettext('712', 'No accompanying matter', 'ccvm', 'value')); +INSERT INTO config.coded_value_map (id, ctype, code, value) VALUES (1735, 'accm', ' ', oils_i18n_gettext('1735', 'No accompanying matter', 'ccvm', 'value')); INSERT INTO config.coded_value_map (id, ctype, code, value) VALUES (713, 'accm', 'a', oils_i18n_gettext('713', 'Discography', 'ccvm', 'value')); INSERT INTO config.coded_value_map (id, ctype, code, value) VALUES (714, 'accm', 'b', oils_i18n_gettext('714', 'Bibliography', 'ccvm', 'value')); INSERT INTO config.coded_value_map (id, ctype, code, value) VALUES (715, 'accm', 'c', oils_i18n_gettext('715', 'Thematic index', 'ccvm', 'value')); @@ -8214,7 +8214,7 @@ INSERT INTO config.coded_value_map (id, ctype, code, value) VALUES (1352, 'pub_s -- i18n ids are left as-is because they are exactly the same value. -- The ' ' codes only apply to the first position because if there's anything in pos 1 then additional spaces are just filler. -- There's also no need for them to be opac visible because there are composite attributes that OR these numbered attributes together. -INSERT INTO config.coded_value_map (id, ctype, code, value, opac_visible) VALUES (1353, 'accm1', ' ', oils_i18n_gettext('712', 'No accompanying matter', 'ccvm', 'value'), FALSE); +INSERT INTO config.coded_value_map (id, ctype, code, value, opac_visible) VALUES (1353, 'accm1', ' ', oils_i18n_gettext('1735', 'No accompanying matter', 'ccvm', 'value'), FALSE); INSERT INTO config.coded_value_map (id, ctype, code, value, opac_visible) VALUES (1354, 'accm1', 'a', oils_i18n_gettext('713', 'Discography', 'ccvm', 'value'), FALSE); INSERT INTO config.coded_value_map (id, ctype, code, value, opac_visible) VALUES (1355, 'accm1', 'b', oils_i18n_gettext('714', 'Bibliography', 'ccvm', 'value'), FALSE); INSERT INTO config.coded_value_map (id, ctype, code, value, opac_visible) VALUES (1356, 'accm1', 'c', oils_i18n_gettext('715', 'Thematic index', 'ccvm', 'value'), FALSE); @@ -8707,7 +8707,7 @@ INSERT INTO config.composite_attr_entry_definition -- electronic INSERT INTO config.composite_attr_entry_definition (coded_value, definition) VALUES -(712, '[{"_attr":"item_form","_val":"s"},{"_attr":"item_form","_val":"o"}]'); +(1735, '[{"_attr":"item_form","_val":"s"},{"_attr":"item_form","_val":"o"}]'); -- use the definitions from the icon_format as the basis for the MR hold format definitions DO $$ @@ -8768,7 +8768,7 @@ UPDATE config.composite_attr_entry_definition -- Any other value has the same meaning in any position. -- Accompanying Matter -INSERT INTO config.composite_attr_entry_definition (coded_value, definition) VALUES (712, '{"_attr":"accm1","_val":" "}'); +INSERT INTO config.composite_attr_entry_definition (coded_value, definition) VALUES (1735, '{"_attr":"accm1","_val":" "}'); INSERT INTO config.composite_attr_entry_definition (coded_value, definition) VALUES (713, '[{"_attr":"accm6","_val":"a"},{"_attr":"accm5","_val":"a"},{"_attr":"accm4","_val":"a"},{"_attr":"accm3","_val":"a"},{"_attr":"accm2","_val":"a"},{"_attr":"accm1","_val":"a"}]'); INSERT INTO config.composite_attr_entry_definition (coded_value, definition) VALUES (714, '[{"_attr":"accm6","_val":"b"},{"_attr":"accm5","_val":"b"},{"_attr":"accm4","_val":"b"},{"_attr":"accm3","_val":"b"},{"_attr":"accm2","_val":"b"},{"_attr":"accm1","_val":"b"}]'); INSERT INTO config.composite_attr_entry_definition (coded_value, definition) VALUES (715, '[{"_attr":"accm6","_val":"c"},{"_attr":"accm5","_val":"c"},{"_attr":"accm4","_val":"c"},{"_attr":"accm3","_val":"c"},{"_attr":"accm2","_val":"c"},{"_attr":"accm1","_val":"c"}]'); diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.more_fixed_fields.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.more_fixed_fields.sql index 20537e7555..0e8c4a2658 100644 --- a/Open-ILS/src/sql/Pg/upgrade/XXXX.more_fixed_fields.sql +++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.more_fixed_fields.sql @@ -174,7 +174,7 @@ UPDATE config.record_attr_definition SET composite = TRUE WHERE name IN ('accm', -- "Next" id for stock config.coded_value_map is 634 as of 7/16/15, but there's an incoming patch that takes 634-711 INSERT INTO config.coded_value_map (id, ctype, code, value) VALUES - (712, 'accm', ' ', oils_i18n_gettext('712', 'No accompanying matter', 'ccvm', 'value')), + (1735, 'accm', ' ', oils_i18n_gettext('1735', 'No accompanying matter', 'ccvm', 'value')), (713, 'accm', 'a', oils_i18n_gettext('713', 'Discography', 'ccvm', 'value')), (714, 'accm', 'b', oils_i18n_gettext('714', 'Bibliography', 'ccvm', 'value')), (715, 'accm', 'c', oils_i18n_gettext('715', 'Thematic index', 'ccvm', 'value')), @@ -839,7 +839,7 @@ INSERT INTO config.coded_value_map (id, ctype, code, value) VALUES -- The ' ' codes only apply to the first position because if there's anything in pos 1 then the rest of the spaces are just filler. -- There's also no need for them to be opac visible because there will be composite attributes that OR these numbered attributes together. INSERT INTO config.coded_value_map (id, ctype, code, value, opac_visible) VALUES - (1353, 'accm1', ' ', oils_i18n_gettext('712', 'No accompanying matter', 'ccvm', 'value'), FALSE), + (1353, 'accm1', ' ', oils_i18n_gettext('1735', 'No accompanying matter', 'ccvm', 'value'), FALSE), (1354, 'accm1', 'a', oils_i18n_gettext('713', 'Discography', 'ccvm', 'value'), FALSE), (1355, 'accm1', 'b', oils_i18n_gettext('714', 'Bibliography', 'ccvm', 'value'), FALSE), (1356, 'accm1', 'c', oils_i18n_gettext('715', 'Thematic index', 'ccvm', 'value'), FALSE), @@ -1249,7 +1249,7 @@ INSERT INTO config.coded_value_map (id, ctype, code, value, opac_visible) VALUES -- Space is used as a filler for any position other than the first, so for something to actually have "No accompanying matter," for example, specifically accm1 must = ' '. -- Any other value has the same meaning in any position. INSERT INTO config.composite_attr_entry_definition (coded_value, definition) VALUES - (712, '{"_attr":"accm1","_val":" "}'), + (1735, '{"_attr":"accm1","_val":" "}'), (713, '[{"_attr":"accm6","_val":"a"},{"_attr":"accm5","_val":"a"},{"_attr":"accm4","_val":"a"},{"_attr":"accm3","_val":"a"},{"_attr":"accm2","_val":"a"},{"_attr":"accm1","_val":"a"}]'), (714, '[{"_attr":"accm6","_val":"b"},{"_attr":"accm5","_val":"b"},{"_attr":"accm4","_val":"b"},{"_attr":"accm3","_val":"b"},{"_attr":"accm2","_val":"b"},{"_attr":"accm1","_val":"b"}]'), (715, '[{"_attr":"accm6","_val":"c"},{"_attr":"accm5","_val":"c"},{"_attr":"accm4","_val":"c"},{"_attr":"accm3","_val":"c"},{"_attr":"accm2","_val":"c"},{"_attr":"accm1","_val":"c"}]'), -- 2.43.2