From 61d6e6c1ebdb329629bed2e07fa0ac73873a02a3 Mon Sep 17 00:00:00 2001 From: Mike Rylander Date: Mon, 16 Apr 2018 10:29:05 -0400 Subject: [PATCH] LP#1745233: Don't test for LURIs during copy location searches When a user is searching with a copy location or location group filter, Located URIs should not be used to include records in the result set because they are not "within" a copy location. Signed-off-by: Mike Rylander Signed-off-by: Cesar Velez Signed-off-by: Kathy Lussier --- .../OpenILS/Application/Storage/Driver/Pg/QueryParser.pm | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Driver/Pg/QueryParser.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Driver/Pg/QueryParser.pm index b3e64eb360..981bff9918 100644 --- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Driver/Pg/QueryParser.pm +++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Driver/Pg/QueryParser.pm @@ -1455,13 +1455,15 @@ sub flatten { push @{$vis_filter{'c_attr'}}, "search.calculate_visibility_attribute_test('circ_lib','{".join(',', @$dorgs)."}',$negate)"; - my $lorgs = [@$aorgs]; - my $luri_as_copy_gf = $U->get_global_flag('opac.located_uri.act_as_copy'); - push @$lorgs, @$dorgs if ($luri_as_copy_gf and $U->is_true($luri_as_copy_gf->enabled)); + if (!$self->find_filter('locations') && !$self->find_filter('location_groups')) { + my $lorgs = [@$aorgs]; + my $luri_as_copy_gf = $U->get_global_flag('opac.located_uri.act_as_copy'); + push @$lorgs, @$dorgs if ($luri_as_copy_gf and $U->is_true($luri_as_copy_gf->enabled)); - $uses_bre = 1; - push @{$vis_filter{'b_attr'}}, - "search.calculate_visibility_attribute_test('luri_org','{".join(',', @$lorgs)."}',$negate)"; + $uses_bre = 1; + push @{$vis_filter{'b_attr'}}, + "search.calculate_visibility_attribute_test('luri_org','{".join(',', @$lorgs)."}',$negate)"; + } my @dlist = (); my $common = 0; -- 2.11.0