From: Bill Erickson <berickxx@gmail.com>
Date: Fri, 5 Aug 2016 14:15:27 +0000 (-0400)
Subject: LP#1587639 Avoid double-update fixes
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=refs%2Fheads%2Fuser%2Fberick%2Flp1587639-vand-auth-edit-date-2;p=working%2FEvergreen.git

LP#1587639 Avoid double-update fixes

Minor syntax / thinko repairs.  Remove 'update_fields' var, which is no
longer used.

Signed-off-by: Bill Erickson <berickxx@gmail.com>
---

diff --git a/Open-ILS/src/sql/Pg/012.schema.vandelay.sql b/Open-ILS/src/sql/Pg/012.schema.vandelay.sql
index ff57e4c8dd..ff474cd858 100644
--- a/Open-ILS/src/sql/Pg/012.schema.vandelay.sql
+++ b/Open-ILS/src/sql/Pg/012.schema.vandelay.sql
@@ -1795,7 +1795,6 @@ DECLARE
     v_marc          TEXT;
     replace_rule    TEXT;
     match_count     INT;
-    update_fields   TEXT[];
     update_query    TEXT;
 BEGIN
 
@@ -1809,13 +1808,13 @@ BEGIN
             JOIN vandelay.authority_match m ON (m.queued_record = q.id AND q.id = import_id)
       LIMIT 1;
 
+    eg_marc := eg_marc_row.marc;
+
     IF eg_marc IS NULL OR v_marc IS NULL THEN
         -- RAISE NOTICE 'no marc for vandelay or authority record';
         RETURN FALSE;
     END IF;
 
-    eg_marc := eg_marc_row.marc
-
     -- Extract the editor string before any modification to the vandelay
     -- MARC occur.
     editor_string := 
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.authority-vandeley-edit-date.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.authority-vandeley-edit-date.sql
index 3a2362ebc1..968a5202bb 100644
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.authority-vandeley-edit-date.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.authority-vandeley-edit-date.sql
@@ -16,7 +16,6 @@ DECLARE
     v_marc          TEXT;
     replace_rule    TEXT;
     match_count     INT;
-    update_fields   TEXT[];
     update_query    TEXT;
 BEGIN
 
@@ -30,13 +29,13 @@ BEGIN
             JOIN vandelay.authority_match m ON (m.queued_record = q.id AND q.id = import_id)
       LIMIT 1;
 
+    eg_marc := eg_marc_row.marc;
+
     IF eg_marc IS NULL OR v_marc IS NULL THEN
         -- RAISE NOTICE 'no marc for vandelay or authority record';
         RETURN FALSE;
     END IF;
 
-    eg_marc := eg_marc_row.marc
-
     -- Extract the editor string before any modification to the vandelay
     -- MARC occur.
     editor_string :=