[open-ils-commits] [GIT] Evergreen ILS branch rel_3_0 updated. 6a8421181a9612a901975f7295c61b13a56de872

Evergreen Git git at git.evergreen-ils.org
Tue Mar 27 11:53:12 EDT 2018


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_3_0 has been updated
       via  6a8421181a9612a901975f7295c61b13a56de872 (commit)
      from  d6a09e851896bc86e7500d329eb1f5fe65b262c9 (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 6a8421181a9612a901975f7295c61b13a56de872
Author: Galen Charlton <gmc at equinoxinitiative.org>
Date:   Tue Mar 27 12:01:00 2018 -0400

    Revert "LP#1758347: ensure that upgrade includes latest asset.merge_record_assets()"
    
    This reverts commit 214ef11de23d81fb631e8debc7b8c04e23d8e752.

diff --git a/Open-ILS/src/sql/Pg/upgrade/1108.schema.lp1758347_fix_merge_record_assets.sql b/Open-ILS/src/sql/Pg/upgrade/1108.schema.lp1758347_fix_merge_record_assets.sql
deleted file mode 100644
index 659d0a0..0000000
--- a/Open-ILS/src/sql/Pg/upgrade/1108.schema.lp1758347_fix_merge_record_assets.sql
+++ /dev/null
@@ -1,277 +0,0 @@
-BEGIN;
-
-SELECT evergreen.upgrade_deps_block_check('1108', :eg_version);
-
-CREATE OR REPLACE FUNCTION asset.merge_record_assets( target_record BIGINT, source_record BIGINT ) RETURNS INT AS $func$
-DECLARE
-    moved_objects INT := 0;
-    source_cn     asset.call_number%ROWTYPE;
-    target_cn     asset.call_number%ROWTYPE;
-    metarec       metabib.metarecord%ROWTYPE;
-    hold          action.hold_request%ROWTYPE;
-    ser_rec       serial.record_entry%ROWTYPE;
-    ser_sub       serial.subscription%ROWTYPE;
-    acq_lineitem  acq.lineitem%ROWTYPE;
-    acq_request   acq.user_request%ROWTYPE;
-    booking       booking.resource_type%ROWTYPE;
-    source_part   biblio.monograph_part%ROWTYPE;
-    target_part   biblio.monograph_part%ROWTYPE;
-    multi_home    biblio.peer_bib_copy_map%ROWTYPE;
-    uri_count     INT := 0;
-    counter       INT := 0;
-    uri_datafield TEXT;
-    uri_text      TEXT := '';
-BEGIN
-
-    -- move any 856 entries on records that have at least one MARC-mapped URI entry
-    SELECT  INTO uri_count COUNT(*)
-      FROM  asset.uri_call_number_map m
-            JOIN asset.call_number cn ON (m.call_number = cn.id)
-      WHERE cn.record = source_record;
-
-    IF uri_count > 0 THEN
-        
-        -- This returns more nodes than you might expect:
-        -- 7 instead of 1 for an 856 with $u $y $9
-        SELECT  COUNT(*) INTO counter
-          FROM  oils_xpath_table(
-                    'id',
-                    'marc',
-                    'biblio.record_entry',
-                    '//*[@tag="856"]',
-                    'id=' || source_record
-                ) as t(i int,c text);
-    
-        FOR i IN 1 .. counter LOOP
-            SELECT  '<datafield xmlns="http://www.loc.gov/MARC21/slim"' || 
-			' tag="856"' ||
-			' ind1="' || FIRST(ind1) || '"'  ||
-			' ind2="' || FIRST(ind2) || '">' ||
-                        STRING_AGG(
-                            '<subfield code="' || subfield || '">' ||
-                            regexp_replace(
-                                regexp_replace(
-                                    regexp_replace(data,'&','&','g'),
-                                    '>', '>', 'g'
-                                ),
-                                '<', '<', 'g'
-                            ) || '</subfield>', ''
-                        ) || '</datafield>' INTO uri_datafield
-              FROM  oils_xpath_table(
-                        'id',
-                        'marc',
-                        'biblio.record_entry',
-                        '//*[@tag="856"][position()=' || i || ']/@ind1|' ||
-                        '//*[@tag="856"][position()=' || i || ']/@ind2|' ||
-                        '//*[@tag="856"][position()=' || i || ']/*/@code|' ||
-                        '//*[@tag="856"][position()=' || i || ']/*[@code]',
-                        'id=' || source_record
-                    ) as t(id int,ind1 text, ind2 text,subfield text,data text);
-
-            -- As most of the results will be NULL, protect against NULLifying
-            -- the valid content that we do generate
-            uri_text := uri_text || COALESCE(uri_datafield, '');
-        END LOOP;
-
-        IF uri_text <> '' THEN
-            UPDATE  biblio.record_entry
-              SET   marc = regexp_replace(marc,'(</[^>]*record>)', uri_text || E'\\1')
-              WHERE id = target_record;
-        END IF;
-
-    END IF;
-
-	-- Find and move metarecords to the target record
-	SELECT	INTO metarec *
-	  FROM	metabib.metarecord
-	  WHERE	master_record = source_record;
-
-	IF FOUND THEN
-		UPDATE	metabib.metarecord
-		  SET	master_record = target_record,
-			mods = NULL
-		  WHERE	id = metarec.id;
-
-		moved_objects := moved_objects + 1;
-	END IF;
-
-	-- Find call numbers attached to the source ...
-	FOR source_cn IN SELECT * FROM asset.call_number WHERE record = source_record LOOP
-
-		SELECT	INTO target_cn *
-		  FROM	asset.call_number
-		  WHERE	label = source_cn.label
-            AND prefix = source_cn.prefix
-            AND suffix = source_cn.suffix
-			AND owning_lib = source_cn.owning_lib
-			AND record = target_record
-			AND NOT deleted;
-
-		-- ... and if there's a conflicting one on the target ...
-		IF FOUND THEN
-
-			-- ... move the copies to that, and ...
-			UPDATE	asset.copy
-			  SET	call_number = target_cn.id
-			  WHERE	call_number = source_cn.id;
-
-			-- ... move V holds to the move-target call number
-			FOR hold IN SELECT * FROM action.hold_request WHERE target = source_cn.id AND hold_type = 'V' LOOP
-		
-				UPDATE	action.hold_request
-				  SET	target = target_cn.id
-				  WHERE	id = hold.id;
-		
-				moved_objects := moved_objects + 1;
-			END LOOP;
-        
-            UPDATE asset.call_number SET deleted = TRUE WHERE id = source_cn.id;
-
-		-- ... if not ...
-		ELSE
-			-- ... just move the call number to the target record
-			UPDATE	asset.call_number
-			  SET	record = target_record
-			  WHERE	id = source_cn.id;
-		END IF;
-
-		moved_objects := moved_objects + 1;
-	END LOOP;
-
-	-- Find T holds targeting the source record ...
-	FOR hold IN SELECT * FROM action.hold_request WHERE target = source_record AND hold_type = 'T' LOOP
-
-		-- ... and move them to the target record
-		UPDATE	action.hold_request
-		  SET	target = target_record
-		  WHERE	id = hold.id;
-
-		moved_objects := moved_objects + 1;
-	END LOOP;
-
-	-- Find serial records targeting the source record ...
-	FOR ser_rec IN SELECT * FROM serial.record_entry WHERE record = source_record LOOP
-		-- ... and move them to the target record
-		UPDATE	serial.record_entry
-		  SET	record = target_record
-		  WHERE	id = ser_rec.id;
-
-		moved_objects := moved_objects + 1;
-	END LOOP;
-
-	-- Find serial subscriptions targeting the source record ...
-	FOR ser_sub IN SELECT * FROM serial.subscription WHERE record_entry = source_record LOOP
-		-- ... and move them to the target record
-		UPDATE	serial.subscription
-		  SET	record_entry = target_record
-		  WHERE	id = ser_sub.id;
-
-		moved_objects := moved_objects + 1;
-	END LOOP;
-
-	-- Find booking resource types targeting the source record ...
-	FOR booking IN SELECT * FROM booking.resource_type WHERE record = source_record LOOP
-		-- ... and move them to the target record
-		UPDATE	booking.resource_type
-		  SET	record = target_record
-		  WHERE	id = booking.id;
-
-		moved_objects := moved_objects + 1;
-	END LOOP;
-
-	-- Find acq lineitems targeting the source record ...
-	FOR acq_lineitem IN SELECT * FROM acq.lineitem WHERE eg_bib_id = source_record LOOP
-		-- ... and move them to the target record
-		UPDATE	acq.lineitem
-		  SET	eg_bib_id = target_record
-		  WHERE	id = acq_lineitem.id;
-
-		moved_objects := moved_objects + 1;
-	END LOOP;
-
-	-- Find acq user purchase requests targeting the source record ...
-	FOR acq_request IN SELECT * FROM acq.user_request WHERE eg_bib = source_record LOOP
-		-- ... and move them to the target record
-		UPDATE	acq.user_request
-		  SET	eg_bib = target_record
-		  WHERE	id = acq_request.id;
-
-		moved_objects := moved_objects + 1;
-	END LOOP;
-
-	-- Find parts attached to the source ...
-	FOR source_part IN SELECT * FROM biblio.monograph_part WHERE record = source_record LOOP
-
-		SELECT	INTO target_part *
-		  FROM	biblio.monograph_part
-		  WHERE	label = source_part.label
-			AND record = target_record;
-
-		-- ... and if there's a conflicting one on the target ...
-		IF FOUND THEN
-
-			-- ... move the copy-part maps to that, and ...
-			UPDATE	asset.copy_part_map
-			  SET	part = target_part.id
-			  WHERE	part = source_part.id;
-
-			-- ... move P holds to the move-target part
-			FOR hold IN SELECT * FROM action.hold_request WHERE target = source_part.id AND hold_type = 'P' LOOP
-		
-				UPDATE	action.hold_request
-				  SET	target = target_part.id
-				  WHERE	id = hold.id;
-		
-				moved_objects := moved_objects + 1;
-			END LOOP;
-
-		-- ... if not ...
-		ELSE
-			-- ... just move the part to the target record
-			UPDATE	biblio.monograph_part
-			  SET	record = target_record
-			  WHERE	id = source_part.id;
-		END IF;
-
-		moved_objects := moved_objects + 1;
-	END LOOP;
-
-	-- Find multi_home items attached to the source ...
-	FOR multi_home IN SELECT * FROM biblio.peer_bib_copy_map WHERE peer_record = source_record LOOP
-		-- ... and move them to the target record
-		UPDATE	biblio.peer_bib_copy_map
-		  SET	peer_record = target_record
-		  WHERE	id = multi_home.id;
-
-		moved_objects := moved_objects + 1;
-	END LOOP;
-
-	-- And delete mappings where the item's home bib was merged with the peer bib
-	DELETE FROM biblio.peer_bib_copy_map WHERE peer_record = (
-		SELECT (SELECT record FROM asset.call_number WHERE id = call_number)
-		FROM asset.copy WHERE id = target_copy
-	);
-
-    -- Apply merge tracking
-    UPDATE biblio.record_entry 
-        SET merge_date = NOW() WHERE id = target_record;
-
-    UPDATE biblio.record_entry
-        SET merge_date = NOW(), merged_to = target_record
-        WHERE id = source_record;
-
-    -- replace book bag entries of source_record with target_record
-    UPDATE container.biblio_record_entry_bucket_item
-        SET target_biblio_record_entry = target_record
-        WHERE bucket IN (SELECT id FROM container.biblio_record_entry_bucket WHERE btype = 'bookbag')
-        AND target_biblio_record_entry = source_record;
-
-    -- Finally, "delete" the source record
-    DELETE FROM biblio.record_entry WHERE id = source_record;
-
-	-- That's all, folks!
-	RETURN moved_objects;
-END;
-$func$ LANGUAGE plpgsql;
-
-COMMIT;

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

Summary of changes:
 ...08.schema.lp1758347_fix_merge_record_assets.sql |  277 --------------------
 1 files changed, 0 insertions(+), 277 deletions(-)
 delete mode 100644 Open-ILS/src/sql/Pg/upgrade/1108.schema.lp1758347_fix_merge_record_assets.sql


hooks/post-receive
-- 
Evergreen ILS


More information about the open-ils-commits mailing list