From: senator <lebbeous@esilibrary.com>
Date: Fri, 22 Apr 2011 16:14:28 +0000 (-0400)
Subject: Merge branch 'vandelay-improvement' of ssh://yeti.esilibrary.com/home/evergreen/everg... 
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=f0dc4e0f1b6a91ae4bffe2245ad14bc02ced4ac8;p=evergreen%2Fequinox.git

Merge branch 'vandelay-improvement' of ssh://yeti.esilibrary.com/home/evergreen/evergreen-equinox into vandelay-improvement

Conflicts:
	Open-ILS/src/sql/Pg/012.schema.vandelay.sql
---

f0dc4e0f1b6a91ae4bffe2245ad14bc02ced4ac8
diff --cc Open-ILS/src/sql/Pg/012.schema.vandelay.sql
index eeb8e2a610,a2f4455567..7b4b055e9c
--- a/Open-ILS/src/sql/Pg/012.schema.vandelay.sql
+++ b/Open-ILS/src/sql/Pg/012.schema.vandelay.sql
@@@ -695,16 -504,14 +695,14 @@@ DECLAR
  BEGIN
      DELETE FROM vandelay.bib_match WHERE queued_record = NEW.id;
  
 -    incoming_existing_id := oils_xpath_string('//*[@tag="901"]/*[@code="c"][1]',NEW.marc);
 +    -- Perfect matches on 901$c exit early with a match with high quality.
 +    incoming_existing_id :=
 +        oils_xpath_string('//*[@tag="901"]/*[@code="c"][1]', NEW.marc);
  
-     IF incoming_existing_id IS NOT NULL THEN
-         SELECT id INTO tmp_rec FROM biblio.record_entry
-             WHERE id = incoming_existing_id;
+     IF incoming_existing_id IS NOT NULL AND incoming_existing_id != '' THEN
+         SELECT id INTO tmp_rec FROM biblio.record_entry WHERE id = incoming_existing_id::bigint;
          IF tmp_rec IS NOT NULL THEN
-             INSERT INTO vandelay.bib_match (queued_record, eg_record, quality)
-                 VALUES (NEW.id, tmp_rec, 9999);
+             INSERT INTO vandelay.bib_match (queued_record, eg_record, quality) VALUES ( NEW.id, incoming_existing_id::bigint, 9999);
              RETURN NEW;
          END IF;
      END IF;