Address regression causing main headings to be null because the thesaurus code we...

Signed-off-by: Mike Rylander <mrylander@gmail.com>
Signed-off-by: Bill Erickson <berick@esilibrary.com>

diff --git a/Open-ILS/src/sql/Pg/011.schema.authority.sql b/Open-ILS/src/sql/Pg/011.schema.authority.sql
index 09bd745..4f8fc74 100644 (file)
--- a/Open-ILS/src/sql/Pg/011.schema.authority.sql
+++ b/Open-ILS/src/sql/Pg/011.schema.authority.sql
@@ -168,7 +168,10 @@ BEGIN
           LIMIT 1;
     END IF;
 
-    IF thes_code = 'z' THEN
+    thes_code := vandelay.marc21_extract_fixed_field(marcxml,'Subj');
+    IF thes_code IS NULL THEN
+        thes_code := '|';
+    ELSIF thes_code = 'z' THEN
         thes_code := COALESCE( oils_xpath_string('//*[@tag="040"]/*[@code="f"][1]', marcxml), '' );
     END IF;
 

diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema-acs-nfi.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema-acs-nfi.sql
index 9f5762f..1e5e85a 100644 (file)
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema-acs-nfi.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema-acs-nfi.sql
@@ -78,7 +78,10 @@ BEGIN
           LIMIT 1;
     END IF;
 
-    IF thes_code = 'z' THEN
+    thes_code := vandelay.marc21_extract_fixed_field(marcxml,'Subj');
+    IF thes_code IS NULL THEN
+        thes_code := '|';
+    ELSIF thes_code = 'z' THEN
         thes_code := COALESCE( oils_xpath_string('//*[@tag="040"]/*[@code="f"][1]', marcxml), '' );
     END IF;