From 6ea18affb416988cddf6d76abab3b134a4ad015e Mon Sep 17 00:00:00 2001 From: Doug Kyle Date: Mon, 14 Apr 2014 12:31:11 -0400 Subject: [PATCH] Make bib source optional element from unapi.bre also add cbs (config bib source) to flesh arg of get_records_and_facets Signed-off-by: Doug Kyle --- Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Search.pm | 6 +++--- .../src/sql/Pg/upgrade/XXXX.schema.unapi_include_bib_source.sql | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) 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 dea01459d5..8c05fda2ff 100644 --- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Search.pm +++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Search.pm @@ -451,7 +451,7 @@ sub load_rresults { my ($facets, @data) = $self->get_records_and_facets( $rec_ids, $results->{facet_key}, { - flesh => '{holdings_xml,mra,acp,acnp,acns,bmp}', + flesh => '{holdings_xml,mra,acp,acnp,acns,bmp,cbs}', site => $site, depth => $depth, pref_lib => $ctx->{pref_ou}, @@ -574,7 +574,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"); @@ -676,7 +676,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/upgrade/XXXX.schema.unapi_include_bib_source.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.unapi_include_bib_source.sql index e852277fcb..f6e0bc295d 100644 --- 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 @@ -73,7 +73,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; -- 2.11.0