[open-ils-commits] [GIT] Evergreen ILS branch rel_2_12 updated. 272fbb4793477a18b5530156fe1b55045c35b789

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, rel_2_12 has been updated
       via  272fbb4793477a18b5530156fe1b55045c35b789 (commit)
       via  bb0bb3250364f8d844c439c1fd18449a747cdd9e (commit)
      from  72e12ff74699285edde5307fba920874d70c68f9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 272fbb4793477a18b5530156fe1b55045c35b789
Author: Bill Erickson <berickxx at gmail.com>
Date:   Mon May 15 14:16:05 2017 -0400

    LP#1170514 Stamping vandelay bib-overlay resync SQL
    
    Signed-off-by: Bill Erickson <berickxx at gmail.com>

diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index 04ae615..7ae58ed 100644
--- a/Open-ILS/src/sql/Pg/002.schema.config.sql
+++ b/Open-ILS/src/sql/Pg/002.schema.config.sql
@@ -91,7 +91,7 @@ CREATE TRIGGER no_overlapping_deps
     BEFORE INSERT OR UPDATE ON config.db_patch_dependencies
     FOR EACH ROW EXECUTE PROCEDURE evergreen.array_overlap_check ('deprecates');
 
-INSERT INTO config.upgrade_log (version, applied_to) VALUES ('1037', :eg_version); -- jeff/dyrcona
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('1038', :eg_version); -- csharp/berick
 
 CREATE TABLE config.bib_source (
 	id		SERIAL	PRIMARY KEY,
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.vandelay_auto_overlay_bib_record.sql b/Open-ILS/src/sql/Pg/upgrade/1038.schema.vandelay_auto_overlay_bib_record.sql
similarity index 95%
rename from Open-ILS/src/sql/Pg/upgrade/XXXX.schema.vandelay_auto_overlay_bib_record.sql
rename to Open-ILS/src/sql/Pg/upgrade/1038.schema.vandelay_auto_overlay_bib_record.sql
index ef1da19..4d5d74d 100644
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.vandelay_auto_overlay_bib_record.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/1038.schema.vandelay_auto_overlay_bib_record.sql
@@ -1,6 +1,6 @@
 BEGIN;
 
-SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version); 
+SELECT evergreen.upgrade_deps_block_check('1038', :eg_version); 
 
 -- This function was replaced back in 2011, but never made it
 -- into an upgrade script.  Here it is, nearly 6 years later.

commit bb0bb3250364f8d844c439c1fd18449a747cdd9e
Author: Chris Sharp <csharp at georgialibraries.org>
Date:   Tue Apr 11 10:20:30 2017 -0400

    LP#1170514 - Upgrade script for vandelay.auto_overlay_bib_record
    
    This script got missed in the 2.1-2.2 era and finally makes it
    in nearly six years later.  Not necessary for sites that began using
    Evergreen since then, but harmless to run.
    
    Signed-off-by: Chris Sharp <csharp at georgialibraries.org>
    Signed-off-by: Bill Erickson <berickxx at gmail.com>

diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.vandelay_auto_overlay_bib_record.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.vandelay_auto_overlay_bib_record.sql
new file mode 100644
index 0000000..ef1da19
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.vandelay_auto_overlay_bib_record.sql
@@ -0,0 +1,44 @@
+BEGIN;
+
+SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version); 
+
+-- This function was replaced back in 2011, but never made it
+-- into an upgrade script.  Here it is, nearly 6 years later.
+
+CREATE OR REPLACE FUNCTION vandelay.auto_overlay_bib_record ( import_id BIGINT, merge_profile_id INT ) RETURNS BOOL AS $$
+DECLARE
+    eg_id           BIGINT;
+    match_count     INT;
+BEGIN
+
+    PERFORM * FROM vandelay.queued_bib_record WHERE import_time IS NOT NULL AND id = import_id;
+
+    IF FOUND THEN
+        -- RAISE NOTICE 'already imported, cannot auto-overlay'
+        RETURN FALSE;
+    END IF;
+
+    SELECT COUNT(*) INTO match_count FROM vandelay.bib_match WHERE queued_record = import_id;
+
+    IF match_count <> 1 THEN
+        -- RAISE NOTICE 'not an exact match';
+        RETURN FALSE;
+    END IF;
+
+    -- Check that the one match is on the first 901c
+    SELECT  m.eg_record INTO eg_id
+      FROM  vandelay.queued_bib_record q
+            JOIN vandelay.bib_match m ON (m.queued_record = q.id)
+      WHERE q.id = import_id
+            AND m.eg_record = oils_xpath_string('//*[@tag="901"]/*[@code="c"][1]',marc)::BIGINT;
+
+    IF NOT FOUND THEN
+        -- RAISE NOTICE 'not a 901c match';
+        RETURN FALSE;
+    END IF;
+
+    RETURN vandelay.overlay_bib_record( import_id, eg_id, merge_profile_id );
+END;
+$$ LANGUAGE PLPGSQL;
+
+COMMIT;

-----------------------------------------------------------------------

Summary of changes:
 Open-ILS/src/sql/Pg/002.schema.config.sql          |    2 +-
 ...038.schema.vandelay_auto_overlay_bib_record.sql |   44 ++++++++++++++++++++
 2 files changed, 45 insertions(+), 1 deletions(-)
 create mode 100644 Open-ILS/src/sql/Pg/upgrade/1038.schema.vandelay_auto_overlay_bib_record.sql


hooks/post-receive
-- 
Evergreen ILS