From 399a5cc724ee3afce781f7e9dc1b50bb570a952b Mon Sep 17 00:00:00 2001 From: Mike Rylander Date: Fri, 7 Oct 2011 10:15:19 -0400 Subject: [PATCH] Address regression causing main headings to be null because the thesaurus code we not being extracted as it was before Signed-off-by: Mike Rylander Signed-off-by: Bill Erickson --- Open-ILS/src/sql/Pg/011.schema.authority.sql | 5 ++++- Open-ILS/src/sql/Pg/upgrade/XXXX.schema-acs-nfi.sql | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Open-ILS/src/sql/Pg/011.schema.authority.sql b/Open-ILS/src/sql/Pg/011.schema.authority.sql index 09bd745b66..4f8fc74e0d 100644 --- 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 9f5762f748..1e5e85a984 100644 --- 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; -- 2.43.2