we will use a real mapping table instead

git-svn-id: svn://svn.open-ils.org/ILS/trunk@16813 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index da2204e..119cecb 100644 (file)
--- a/Open-ILS/src/sql/Pg/002.schema.config.sql
+++ b/Open-ILS/src/sql/Pg/002.schema.config.sql
@@ -68,7 +68,7 @@ CREATE TABLE config.upgrade_log (
     install_date    TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT NOW()
 );
 
-INSERT INTO config.upgrade_log (version) VALUES ('0316'); -- miker
+INSERT INTO config.upgrade_log (version) VALUES ('0317'); -- miker
 
 CREATE TABLE config.bib_source (
        id              SERIAL  PRIMARY KEY,

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 26bf96a..67045d1 100644 (file)
--- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@ -82,8 +82,6 @@ INSERT INTO config.metabib_field ( id, field_class, name, label, format, xpath )
     (24, 'identifier', 'sici', oils_i18n_gettext(24, 'SICI', 'cmf', 'label'), 'marcxml', $$//marc:datafield[@tag='024' and ind1='4']/marc:subfield[@code='a' or @code='z']$$ );
 INSERT INTO config.metabib_field ( id, field_class, name, label, format, xpath ) VALUES
     (25, 'identifier', 'bibcn', oils_i18n_gettext(25, 'Local Free-Text Call Number', 'cmf', 'label'), 'marcxml', $$//marc:datafield[@tag='099']//text()$$ );
-INSERT INTO config.metabib_field ( id, field_class, name, label, format, xpath, facet_field, search_field ) VALUES
-    (26, 'identifier', 'arcn', oils_i18n_gettext(26, 'Authority record control number', 'cmf', 'label'), 'marcxml', $$//marc:subfield[@code='0']$$, TRUE, FALSE );
 
 SELECT SETVAL('config.metabib_field_id_seq'::TEXT, (SELECT MAX(id) FROM config.metabib_field), TRUE);
 
@@ -4288,24 +4286,6 @@ INSERT INTO config.metabib_field_index_norm_map (field,norm,params)
       WHERE i.func IN ('replace')
             AND m.id IN (19);
 
-INSERT INTO config.metabib_field_index_norm_map (field,norm,pos)
-    SELECT  m.id,
-            i.id,
-            -2
-      FROM  config.metabib_field m,
-            config.index_normalizer i
-      WHERE i.func IN ('remove_paren_substring')
-            AND m.id IN (26);
-
-INSERT INTO config.metabib_field_index_norm_map (field,norm,pos)
-    SELECT  m.id,
-            i.id,
-            -1
-      FROM  config.metabib_field m,
-            config.index_normalizer i
-      WHERE i.func IN ('btrim')
-            AND m.id IN (26);
-
 
 -- claims returned mark item missing 
 INSERT INTO

diff --git a/Open-ILS/src/sql/Pg/upgrade/0317.data.remove-acrn-index-def.sql b/Open-ILS/src/sql/Pg/upgrade/0317.data.remove-acrn-index-def.sql
new file mode 100644 (file)
index 0000000..a63dc85
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/0317.data.remove-acrn-index-def.sql
@@ -0,0 +1,8 @@
+BEGIN;
+
+INSERT INTO config.upgrade_log (version) VALUES ('0317'); -- miker
+
+DELETE FROM config.metabib_field_index_norm_map WHERE field = 26;
+DELETE FROM config.metabib_field WHERE id = 26;
+
+COMMIT;