move reingests to the end

diff --git a/Open-ILS/src/sql/Pg/version-upgrade/3.0.6-3.1.0-upgrade-db.sql b/Open-ILS/src/sql/Pg/version-upgrade/3.0.6-3.1.0-upgrade-db.sql
index bc5e5c9..9e096bd 100644 (file)
--- a/Open-ILS/src/sql/Pg/version-upgrade/3.0.6-3.1.0-upgrade-db.sql
+++ b/Open-ILS/src/sql/Pg/version-upgrade/3.0.6-3.1.0-upgrade-db.sql
@@ -548,15 +548,15 @@ SELECT evergreen.upgrade_deps_block_check('1093', :eg_version);
 UPDATE config.record_attr_definition SET tag = '041', sf_list = 'abdefgm' where name = 'item_lang';
 
 
-
-SELECT evergreen.upgrade_deps_block_check('1094', :eg_version);
-
-SELECT metabib.reingest_record_attributes (record, '{item_lang}'::TEXT[])
-  FROM (SELECT  DISTINCT record
-          FROM  metabib.real_full_rec
-           WHERE tag = '041'
-                  AND subfield IN ('a','b','d','e','f','g','m')
-       ) x;
+-- PINES will do this reingest at the end
+--SELECT evergreen.upgrade_deps_block_check('1094', :eg_version);
+--
+--SELECT metabib.reingest_record_attributes (record, '{item_lang}'::TEXT[])
+--  FROM (SELECT  DISTINCT record
+--          FROM  metabib.real_full_rec
+--           WHERE tag = '041'
+--                  AND subfield IN ('a','b','d','e','f','g','m')
+--       ) x;
 
 
 
@@ -908,17 +908,18 @@ VALUES (
     51, 'author', 'first_author', 'mods32',
     oils_i18n_gettext(51, 'Author', 'cmf', 'label'),
     $$//mods32:mods/mods32:name[mods32:role/mods32:roleTerm[text()='creator']][1]$$,
-    $$//*[local-name()='namePart']$$,
+    $$//*[local-name()='namePart']$$, -- vim is dumb */
     TRUE, TRUE, FALSE
 );
 
+
 INSERT INTO config.metabib_field (id, field_class, name, format,
     label, xpath, display_xpath, display_field, search_field, browse_field)
 VALUES (
     52, 'identifier', 'origin_info', 'marcxml',
     oils_i18n_gettext(52, 'Origin Info', 'cmf', 'label'),
     $$//*[@tag='260']$$,
-    $$//*[local-name()='subfield' and contains('abc',@code)]$$,
+    $$//*[local-name()='subfield' and contains('abc',@code)]$$, --vim */
     TRUE, FALSE, FALSE
 );
 
@@ -8932,28 +8933,29 @@ values ('circ.staff_placed_holds_fallback_to_ws_ou','Workstation OU fallback for
 
 COMMIT;
 
-\qecho 
-\qecho Reingesting all records.  This may take a while. 
-\qecho This command can be stopped (control-c) and rerun later if needed: 
-\qecho 
-\qecho DO $FUNC$
-\qecho DECLARE
-\qecho     same_marc BOOL;
-\qecho BEGIN
-\qecho     SELECT INTO same_marc enabled FROM config.internal_flag WHERE name = 'ingest.reingest.force_on_same_marc';
-\qecho     UPDATE config.internal_flag SET enabled = true WHERE name = 'ingest.reingest.force_on_same_marc';
-\qecho     UPDATE biblio.record_entry SET id=id WHERE not deleted AND id > 0;
-\qecho     UPDATE config.internal_flag SET enabled = same_marc WHERE name = 'ingest.reingest.force_on_same_marc';
-\qecho END;
-\qecho $FUNC$;
-
-DO $FUNC$
-DECLARE
-    same_marc BOOL;
-BEGIN
-    SELECT INTO same_marc enabled FROM config.internal_flag WHERE name = 'ingest.reingest.force_on_same_marc';
-    UPDATE config.internal_flag SET enabled = true WHERE name = 'ingest.reingest.force_on_same_marc';
-    UPDATE biblio.record_entry SET id=id WHERE not deleted AND id > 0;
-    UPDATE config.internal_flag SET enabled = same_marc WHERE name = 'ingest.reingest.force_on_same_marc';
-END;
-$FUNC$;
+-- PINES will do this reingest later
+--\qecho 
+--\qecho Reingesting all records.  This may take a while. 
+--\qecho This command can be stopped (control-c) and rerun later if needed: 
+--\qecho 
+--\qecho DO $FUNC$
+--\qecho DECLARE
+--\qecho     same_marc BOOL;
+--\qecho BEGIN
+--\qecho     SELECT INTO same_marc enabled FROM config.internal_flag WHERE name = 'ingest.reingest.force_on_same_marc';
+--\qecho     UPDATE config.internal_flag SET enabled = true WHERE name = 'ingest.reingest.force_on_same_marc';
+--\qecho     UPDATE biblio.record_entry SET id=id WHERE not deleted AND id > 0;
+--\qecho     UPDATE config.internal_flag SET enabled = same_marc WHERE name = 'ingest.reingest.force_on_same_marc';
+--\qecho END;
+--\qecho $FUNC$;
+--
+--DO $FUNC$
+--DECLARE
+--    same_marc BOOL;
+--BEGIN
+--    SELECT INTO same_marc enabled FROM config.internal_flag WHERE name = 'ingest.reingest.force_on_same_marc';
+--    UPDATE config.internal_flag SET enabled = true WHERE name = 'ingest.reingest.force_on_same_marc';
+--    UPDATE biblio.record_entry SET id=id WHERE not deleted AND id > 0;
+--    UPDATE config.internal_flag SET enabled = same_marc WHERE name = 'ingest.reingest.force_on_same_marc';
+--END;
+--$FUNC$;

diff --git a/Open-ILS/src/sql/Pg/version-upgrade/pines-post-3.2-upgrade.sql b/Open-ILS/src/sql/Pg/version-upgrade/pines-post-3.2-upgrade.sql
new file mode 100644 (file)
index 0000000..8c918fd
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/version-upgrade/pines-post-3.2-upgrade.sql
@@ -0,0 +1,12 @@
+-- perform delayed reingest from 3.0.6-3.1.0 script
+
+SELECT evergreen.upgrade_deps_block_check('1094', :eg_version);
+
+SELECT metabib.reingest_record_attributes (record, '{item_lang}'::TEXT[])
+  FROM (SELECT  DISTINCT record
+          FROM  metabib.real_full_rec
+           WHERE tag = '041'
+                  AND subfield IN ('a','b','d','e','f','g','m')
+       ) x;
+
+-- XXX do we even need to do this^^ if we're going to be using pingest?