LP#1269911 seed data SQL repairs

Products of merge conflict resolution with the mvf-cra branch.

* repaired syntax error
* removed some duplicate global flag entries

Signed-off-by: Bill Erickson <berick@esilibrary.com>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Signed-off-by: Dan Wells <dbw2@calvin.edu>

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 c53ef10..1605b05 100644 (file)
--- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@ -6091,7 +6091,7 @@ INSERT INTO config.record_attr_definition (name, label, multi, filter, composite
     VALUES ('icon_format', oils_i18n_gettext('icon_format', 'OPAC Format Icons', 'crad', 'label'), TRUE, TRUE, TRUE);
 INSERT INTO config.record_attr_definition (name, label, multi, filter, composite) 
     VALUES ('mr_hold_format', oils_i18n_gettext('mr_hold_format', 'Metarecord Hold Formats', 'crad', 'label'),
-    TRUE, TRUE, TRUE
+    TRUE, TRUE, TRUE);
 
 -- TO-DO: Auto-generate these values from CLDR
 -- XXX These are the values used in MARC records ... does that match CLDR, including deprecated languages?
@@ -9679,18 +9679,6 @@ INSERT INTO config.global_flag (name, label, value, enabled) VALUES (
     TRUE
 );
 
-INSERT INTO config.record_attr_definition
-    (name, label, multi, filter, composite) VALUES (
-    'icon_format',
-    oils_i18n_gettext(
-        'icon_format',
-        'OPAC Format Icons',
-        'crad',
-        'label'
-    ),
-    TRUE, TRUE, TRUE
-);
-
 INSERT INTO config.usr_setting_type (name,opac_visible,label,description,datatype)
     VALUES (
         'history.circ.retention_age',
@@ -13926,19 +13914,6 @@ INSERT INTO config.floating_group(name) VALUES ('Everywhere');
 INSERT INTO config.floating_group_member(floating_group, org_unit) VALUES (1, 1);
 
 INSERT INTO config.global_flag (name, label, value, enabled) VALUES (
-    'opac.icon_attr',
-    oils_i18n_gettext(
-        'opac.icon_attr', 
-        'OPAC Format Icons Attribute',
-        'cgf',
-        'label'
-    ),
-    'icon_format', 
-    TRUE
-);
-
-
-INSERT INTO config.global_flag (name, label, value, enabled) VALUES (
     'opac.metarecord.holds.format_attr', 
     oils_i18n_gettext(
         'opac.metarecord.holds.format_attr',