From ff0aa859e8069ba053efa23a55124ccd45ed212d Mon Sep 17 00:00:00 2001 From: blake Date: Tue, 7 Nov 2017 10:14:32 -0600 Subject: [PATCH] LP#1730692: fix two references to asset.copy_vis_attr_cache Corrected the table references in metabib.pm and site_generator. To test ------- [1] Apply the patch. [2] Verify that sitemap_generator no longer crashes. [3] Verify that open-ils.storage.ordered.metabib.metarecord.records can be called without crashing. Signed-off-by: blake Signed-off-by: Galen Charlton --- .../lib/OpenILS/Application/Storage/Publisher/metabib.pm | 2 +- Open-ILS/src/support-scripts/sitemap_generator | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Publisher/metabib.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Publisher/metabib.pm index a8b216175e..c8c3ea76e7 100644 --- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Publisher/metabib.pm +++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Publisher/metabib.pm @@ -95,7 +95,7 @@ sub ordered_records_from_metarecord { # XXX Replace with QP-based search-within- my $org = shift; my $depth = shift; - my $copies_visible = 'LEFT JOIN asset.copy_attr_vis_cache vc ON (br.id = vc.record '. + my $copies_visible = 'LEFT JOIN asset.copy_vis_attr_cache vc ON (br.id = vc.record '. 'AND vc.vis_attr_vector @@ (SELECT c_attrs::query_int FROM asset.patron_default_visibility_mask() LIMIT 1))'; $copies_visible = '' if ($self->api_name =~ /staff/o); diff --git a/Open-ILS/src/support-scripts/sitemap_generator b/Open-ILS/src/support-scripts/sitemap_generator index 16fe5fd383..1a238f5949 100755 --- a/Open-ILS/src/support-scripts/sitemap_generator +++ b/Open-ILS/src/support-scripts/sitemap_generator @@ -154,7 +154,7 @@ sub get_record_ids { ELSE bre.edit_date::date END AS edit_date FROM biblio.record_entry bre - INNER JOIN asset.copy_attr_vis_cache vc ON (bre.id = vc.record + INNER JOIN asset.copy_vis_attr_cache vc ON (bre.id = vc.record AND vc.vis_attr_vector @@ ( SELECT c_attrs::query_int FROM asset.patron_default_visibility_mask() -- 2.43.2