LP#1178377: Make bib source optional element from unapi.bre

also add cbs (config bib source) to flesh arg of get_records_and_facets

Change the baseline schema file

Signed-off-by: Doug Kyle <dkyle@grpl.org>
Signed-off-by: Ben Shum <bshum@biblio.org>

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Search.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Search.pm
index 19f3a25..ccd8471 100644 (file)
--- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Search.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Search.pm
@@ -477,7 +477,7 @@ sub load_rresults {
     my ($facets, @data) = $self->get_records_and_facets(
         $fetch_recs, $results->{facet_key}, 
         {
-            flesh => '{holdings_xml,mra,acp,acnp,acns,bmp}',
+            flesh => '{holdings_xml,mra,acp,acnp,acns,bmp,cbs}',
             site => $site,
             metarecord => $is_meta,
             depth => $depth,
@@ -616,7 +616,7 @@ sub item_barcode_shortcut {
 
         $self->timelog("Calling get_records_and_facets() for item_barcode");
         my ($facets, @data) = $self->get_records_and_facets(
-            $rec_ids, undef, {flesh => "{holdings_xml,mra,acnp,acns,bmp}"}
+            $rec_ids, undef, {flesh => "{holdings_xml,mra,acnp,acns,bmp,cbs}"}
         );
         $self->timelog("Returned from calling get_records_and_facets() for item_barcode");
 
@@ -735,7 +735,7 @@ sub marc_expert_search {
     $self->timelog("Calling get_records_and_facets() for MARC expert");
     my ($facets, @data) = $self->get_records_and_facets(
         $self->ctx->{ids}, undef, {
-            flesh => "{holdings_xml,mra,acnp,acns}",
+            flesh => "{holdings_xml,mra,acnp,acns,cbs}",
             pref_lib => $self->ctx->{pref_ou},
         }
     );

diff --git a/Open-ILS/src/sql/Pg/990.schema.unapi.sql b/Open-ILS/src/sql/Pg/990.schema.unapi.sql
index 3fbf8bb..b4da6a0 100644 (file)
--- a/Open-ILS/src/sql/Pg/990.schema.unapi.sql
+++ b/Open-ILS/src/sql/Pg/990.schema.unapi.sql
@@ -435,7 +435,7 @@ BEGIN
     SELECT * INTO me FROM biblio.record_entry WHERE id = obj_id;
 
     -- grab bib_source, if any
-    IF me.source IS NOT NULL THEN
+    IF ('cbs' = ANY (includes) AND me.source IS NOT NULL) THEN
         source := unapi.cbs(me.source,NULL,NULL,NULL,NULL);
     ELSE
         source := NULL::XML;

diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.unapi_include_bib_source.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.unapi_include_bib_source.sql
index 20ab5ae..17a4512 100644 (file)
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.unapi_include_bib_source.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.unapi_include_bib_source.sql
@@ -72,7 +72,7 @@ BEGIN
     SELECT * INTO me FROM biblio.record_entry WHERE id = obj_id;
 
     -- grab bib_source, if any
-    IF me.source IS NOT NULL THEN
+    IF ('cbs' = ANY (includes) AND me.source IS NOT NULL) THEN
         source := unapi.cbs(me.source,NULL,NULL,NULL,NULL);
     ELSE
         source := NULL::XML;