[open-ils-commits] r16813 - in trunk/Open-ILS/src/sql/Pg: . upgrade (miker)

[svn at svn.open-ils.org]

Author: miker
Date: 2010-06-25 11:16:16 -0400 (Fri, 25 Jun 2010)
New Revision: 16813

Added:
   trunk/Open-ILS/src/sql/Pg/upgrade/0317.data.remove-acrn-index-def.sql
Modified:
   trunk/Open-ILS/src/sql/Pg/002.schema.config.sql
   trunk/Open-ILS/src/sql/Pg/950.data.seed-values.sql
Log:
we will use a real mapping table instead

Modified: trunk/Open-ILS/src/sql/Pg/002.schema.config.sql
===================================================================
--- trunk/Open-ILS/src/sql/Pg/002.schema.config.sql	2010-06-25 14:47:56 UTC (rev 16812)
+++ trunk/Open-ILS/src/sql/Pg/002.schema.config.sql	2010-06-25 15:16:16 UTC (rev 16813)
@@ -68,7 +68,7 @@
     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,

Modified: trunk/Open-ILS/src/sql/Pg/950.data.seed-values.sql
===================================================================
--- trunk/Open-ILS/src/sql/Pg/950.data.seed-values.sql	2010-06-25 14:47:56 UTC (rev 16812)
+++ trunk/Open-ILS/src/sql/Pg/950.data.seed-values.sql	2010-06-25 15:16:16 UTC (rev 16813)
@@ -82,8 +82,6 @@
     (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,25 +4286,7 @@
       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
     config.org_unit_setting_type ( name, label, description, datatype )

Added: trunk/Open-ILS/src/sql/Pg/upgrade/0317.data.remove-acrn-index-def.sql
===================================================================
--- trunk/Open-ILS/src/sql/Pg/upgrade/0317.data.remove-acrn-index-def.sql	                        (rev 0)
+++ trunk/Open-ILS/src/sql/Pg/upgrade/0317.data.remove-acrn-index-def.sql	2010-06-25 15:16:16 UTC (rev 16813)
@@ -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;