From: Galen Charlton <gmc@equinoxinitiative.org>
Date: Fri, 6 Sep 2019 21:51:21 +0000 (-0400)
Subject: LP#1444644: stamp database update
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=e6a851c215e151200d02355959608c914b901a92;p=evergreen%2Fjoelewis.git
LP#1444644: stamp database update
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
---
diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index 79af8ae0ba..797103561a 100644
--- a/Open-ILS/src/sql/Pg/002.schema.config.sql
+++ b/Open-ILS/src/sql/Pg/002.schema.config.sql
@@ -92,7 +92,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 ('1181', :eg_version); -- berick/csharp/gmcharlt
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('1182', :eg_version); -- liam/jeffdavis/gmcharlt
CREATE TABLE config.bib_source (
id SERIAL PRIMARY KEY,
diff --git a/Open-ILS/src/sql/Pg/upgrade/1182.schema.vandelay.auto_overlay_org_unit_copies.sql b/Open-ILS/src/sql/Pg/upgrade/1182.schema.vandelay.auto_overlay_org_unit_copies.sql
new file mode 100644
index 0000000000..13816a30bc
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/1182.schema.vandelay.auto_overlay_org_unit_copies.sql
@@ -0,0 +1,81 @@
+BEGIN;
+
+SELECT evergreen.upgrade_deps_block_check('1182', :eg_version);
+
+INSERT INTO permission.perm_list ( id, code, description ) VALUES
+ ( 616, 'IMPORT_USE_ORG_UNIT_COPIES', oils_i18n_gettext( 616,
+ 'Allows users to import records based on the number of org unit copies attached to a record', 'ppl', 'description' )),
+ ( 617, 'IMPORT_ON_ORDER_CAT_COPY', oils_i18n_gettext( 617,
+ 'Allows users to import copies based on the on-order items attached to a record', 'ppl', 'description' ));
+
+CREATE OR REPLACE FUNCTION vandelay.auto_overlay_org_unit_copies ( import_id BIGINT, merge_profile_id INT, lwm_ratio_value_p NUMERIC ) RETURNS BOOL AS $$
+DECLARE
+ eg_id BIGINT;
+ match_count INT;
+ rec vandelay.bib_match%ROWTYPE;
+ v_owning_lib INT;
+ scope_org INT;
+ scope_orgs INT[];
+ copy_count INT := 0;
+ max_copy_count INT := 0;
+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;
+
+ -- Gather all the owning libs for our import items.
+ -- These are our initial scope_orgs.
+ SELECT ARRAY_AGG(DISTINCT owning_lib) INTO scope_orgs
+ FROM vandelay.import_item
+ WHERE queued_record = import_id;
+
+ WHILE CARDINALITY(scope_orgs) > 0 LOOP
+ FOR scope_org IN SELECT * FROM UNNEST(scope_orgs) LOOP
+ -- For each match, get a count of all copies at descendants of our scope org.
+ FOR rec IN SELECT * FROM vandelay.bib_match AS vbm
+ WHERE queued_record = import_id
+ ORDER BY vbm.eg_record DESC
+ LOOP
+ SELECT COUNT(acp.id) INTO copy_count
+ FROM asset.copy AS acp
+ INNER JOIN asset.call_number AS acn
+ ON acp.call_number = acn.id
+ WHERE acn.owning_lib IN (SELECT id FROM
+ actor.org_unit_descendants(scope_org))
+ AND acn.record = rec.eg_record
+ AND acp.deleted = FALSE;
+ IF copy_count > max_copy_count THEN
+ max_copy_count := copy_count;
+ eg_id := rec.eg_record;
+ END IF;
+ END LOOP;
+ END LOOP;
+
+ -- If no matching bibs had holdings, gather our next set of orgs to check, and iterate.
+ IF max_copy_count = 0 THEN
+ SELECT ARRAY_AGG(DISTINCT parent_ou) INTO scope_orgs
+ FROM actor.org_unit
+ WHERE id IN (SELECT * FROM UNNEST(scope_orgs))
+ AND parent_ou IS NOT NULL;
+ END IF;
+ END LOOP;
+
+ IF eg_id IS NULL THEN
+ -- Could not determine best match via copy count
+ -- fall back to default best match
+ IF (SELECT * FROM vandelay.auto_overlay_bib_record_with_best( import_id, merge_profile_id, lwm_ratio_value_p )) THEN
+ RETURN TRUE;
+ ELSE
+ RETURN FALSE;
+ END IF;
+ END IF;
+
+ RETURN vandelay.overlay_bib_record( import_id, eg_id, merge_profile_id );
+END;
+$$ LANGUAGE PLPGSQL;
+
+COMMIT;
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.vandelay.auto_overlay_org_unit_copies.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.vandelay.auto_overlay_org_unit_copies.sql
deleted file mode 100644
index 20ec31d5c1..0000000000
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.vandelay.auto_overlay_org_unit_copies.sql
+++ /dev/null
@@ -1,79 +0,0 @@
-BEGIN;
-
-INSERT INTO permission.perm_list ( id, code, description ) VALUES
- ( 616, 'IMPORT_USE_ORG_UNIT_COPIES', oils_i18n_gettext( 616,
- 'Allows users to import records based on the number of org unit copies attached to a record', 'ppl', 'description' )),
- ( 617, 'IMPORT_ON_ORDER_CAT_COPY', oils_i18n_gettext( 617,
- 'Allows users to import copies based on the on-order items attached to a record', 'ppl', 'description' ));
-
-CREATE OR REPLACE FUNCTION vandelay.auto_overlay_org_unit_copies ( import_id BIGINT, merge_profile_id INT, lwm_ratio_value_p NUMERIC ) RETURNS BOOL AS $$
-DECLARE
- eg_id BIGINT;
- match_count INT;
- rec vandelay.bib_match%ROWTYPE;
- v_owning_lib INT;
- scope_org INT;
- scope_orgs INT[];
- copy_count INT := 0;
- max_copy_count INT := 0;
-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;
-
- -- Gather all the owning libs for our import items.
- -- These are our initial scope_orgs.
- SELECT ARRAY_AGG(DISTINCT owning_lib) INTO scope_orgs
- FROM vandelay.import_item
- WHERE queued_record = import_id;
-
- WHILE CARDINALITY(scope_orgs) > 0 LOOP
- FOR scope_org IN SELECT * FROM UNNEST(scope_orgs) LOOP
- -- For each match, get a count of all copies at descendants of our scope org.
- FOR rec IN SELECT * FROM vandelay.bib_match AS vbm
- WHERE queued_record = import_id
- ORDER BY vbm.eg_record DESC
- LOOP
- SELECT COUNT(acp.id) INTO copy_count
- FROM asset.copy AS acp
- INNER JOIN asset.call_number AS acn
- ON acp.call_number = acn.id
- WHERE acn.owning_lib IN (SELECT id FROM
- actor.org_unit_descendants(scope_org))
- AND acn.record = rec.eg_record
- AND acp.deleted = FALSE;
- IF copy_count > max_copy_count THEN
- max_copy_count := copy_count;
- eg_id := rec.eg_record;
- END IF;
- END LOOP;
- END LOOP;
-
- -- If no matching bibs had holdings, gather our next set of orgs to check, and iterate.
- IF max_copy_count = 0 THEN
- SELECT ARRAY_AGG(DISTINCT parent_ou) INTO scope_orgs
- FROM actor.org_unit
- WHERE id IN (SELECT * FROM UNNEST(scope_orgs))
- AND parent_ou IS NOT NULL;
- END IF;
- END LOOP;
-
- IF eg_id IS NULL THEN
- -- Could not determine best match via copy count
- -- fall back to default best match
- IF (SELECT * FROM vandelay.auto_overlay_bib_record_with_best( import_id, merge_profile_id, lwm_ratio_value_p )) THEN
- RETURN TRUE;
- ELSE
- RETURN FALSE;
- END IF;
- END IF;
-
- RETURN vandelay.overlay_bib_record( import_id, eg_id, merge_profile_id );
-END;
-$$ LANGUAGE PLPGSQL;
-
-COMMIT;