[open-ils-commits] [GIT] Evergreen ILS branch master updated. 979d0c29018120d86ff03e12f7c66c07230420cb
Evergreen Git
git at git.evergreen-ils.org
Tue Jan 9 19:00:04 EST 2018
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".
The branch, master has been updated
via 979d0c29018120d86ff03e12f7c66c07230420cb (commit)
via d63b81fc37ff73d8c5030ce97234b9af61c37220 (commit)
via 13d0596d1500c03c10e2fb600edf473542354eb5 (commit)
from bfd5b2f43a0d603972440d727310c7f03a5583e1 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 979d0c29018120d86ff03e12f7c66c07230420cb
Author: Mike Rylander <mrylander at gmail.com>
Date: Mon Jan 8 16:43:26 2018 -0500
LP#1736419: Bib visibility tests get OR'd
Either the source or the existance of a Located URI will trigger record
visibility, so we will OR them together.
NOTE: This branch is dependant on the branch supplied on LP#1730758. Without
that fix, the bib-level visibility attributes are not updated properly when
Located URIs are added or changed.
Signed-off-by: Mike Rylander <mrylander at gmail.com>
Signed-off-by: Kathy Lussier <klussier at masslnc.org>
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 e84efa2..9a02d33 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
@@ -1054,7 +1054,7 @@ sub toSQL {
# WITH-clause just generates vis test
$$flat_plan{with} .= "\n," if $$flat_plan{with};
- $$flat_plan{with} .= "b_attr AS (SELECT (ARRAY_TO_STRING(ARRAY[$vis_test],'&'))::query_int AS vis_test FROM asset.patron_default_visibility_mask() x)";
+ $$flat_plan{with} .= "b_attr AS (SELECT (ARRAY_TO_STRING(ARRAY[$vis_test],'|'))::query_int AS vis_test FROM asset.patron_default_visibility_mask() x)";
# These are magic numbers... see: search.calculate_visibility_attribute() UDF
$final_b_attr_test = '(b_attr.vis_test IS NULL OR bre.vis_attr_vector @@ b_attr.vis_test)';
commit d63b81fc37ff73d8c5030ce97234b9af61c37220
Author: Mike Rylander <mrylander at gmail.com>
Date: Fri Jan 5 17:04:53 2018 -0500
LP#1736419: Located URIs vs QueryParser, round 2, part deux
Now we will be less strict about the 'act_as_copy' flag, and only check for
enabledness, rather than the truth of its value column.
Signed-off-by: Mike Rylander <mrylander at gmail.com>
Signed-off-by: Kathy Lussier <klussier at masslnc.org>
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 5e5ac44..e84efa2 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
@@ -1342,11 +1342,7 @@ sub flatten {
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)
- and $U->is_true($luri_as_copy_gf->value)
- );
+ 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'}},
commit 13d0596d1500c03c10e2fb600edf473542354eb5
Author: Mike Rylander <mrylander at gmail.com>
Date: Thu Jan 4 18:12:17 2018 -0500
LP#1736419: Located URIs vs QueryParser, round 2
The site() filter and #staff modifier are used to decide when and how to
include certain query filters, such as circ_lib or luri_org. Unfortunately,
site() is sometimes excluded (whole-tree search) and the test for staff-
iness was not specific enough, leading to incorrect queries in those cases
where information was lacking. Now, we treat site() specially, forcing a
default of "top-of-tree", and we check for the #staff modifier directly
where necessary.
Note: this commit also addresses LP#1736992 which is about staff searches
using the limit-to-available modifier. As a side effect of the special
site() treatment, that issue is resolved.
Signed-off-by: Mike Rylander <mrylander at gmail.com>
Signed-off-by: Kathy Lussier <klussier at masslnc.org>
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 1fb0c9f..5e5ac44 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
@@ -1013,14 +1013,18 @@ sub toSQL {
$$flat_plan{with} .= "c_attr AS (SELECT (ARRAY_TO_STRING(ARRAY[$vis_test],'&'))::query_int AS vis_test FROM asset.patron_default_visibility_mask() x)";
$final_c_attr_test = 'EXISTS (SELECT 1 FROM asset.copy_vis_attr_cache WHERE record = m.source AND vis_attr_vector @@ c_attr.vis_test)';
- if (!$pc_vis_test) { # staff search
- $final_c_attr_test = '(' . $final_c_attr_test . " OR (" .
- "NOT EXISTS (SELECT 1 FROM asset.copy_vis_attr_cache WHERE record = m.source) " .
- "AND (bre.vis_attr_vector IS NULL OR NOT ( int4range(0,268435455,'[]') @> ANY(bre.vis_attr_vector) ))".
- "))";
- }
}
+ if ($self->find_modifier('staff')) { # staff search
+ $final_c_attr_test ||= 'FALSE';
+ $final_c_attr_test = '(' . $final_c_attr_test . " OR (" .
+ "NOT EXISTS (SELECT 1 FROM asset.copy_vis_attr_cache WHERE record = m.source) " .
+ "AND (bre.vis_attr_vector IS NULL OR NOT ( int4range(0,268435455,'[]') @> ANY(bre.vis_attr_vector) ))".
+ "))";
+ # We need bre here, regardless
+ $bre_join ||= 'INNER JOIN biblio.record_entry bre ON m.source = bre.id';
+ }
+
my $final_b_attr_test;
my $b_attr_join = '';
my $b_vis_test = '';
@@ -1318,6 +1322,36 @@ sub flatten {
$depth_filter = $depth_filter->args->[0];
}
+ my $ot = $U->get_org_tree;
+ my $site_org = $ot;
+ my $negate = 'FALSE';
+
+ my ($site_filter) = grep { $_->name eq 'site' } @{$self->filters};
+ if ($site_filter and @{$site_filter->args} == 1) {
+ $negate = $site_filter->negate ? 'TRUE' : 'FALSE';
+
+ my $sitename = $site_filter->args->[0];
+ $site_org = $U->find_org_by_shortname($ot, $sitename) || $ot;
+ }
+
+ my $dorgs = $U->get_org_descendants($site_org->id, $depth_filter);
+ my $aorgs = $U->get_org_ancestors($site_org->id);
+
+ 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)
+ and $U->is_true($luri_as_copy_gf->value)
+ );
+
+ $uses_bre = 1;
+ push @{$vis_filter{'b_attr'}},
+ "search.calculate_visibility_attribute_test('luri_org','{".join(',', @$lorgs)."}',$negate)";
+
my @dlist = ();
my $common = 0;
# for each dynamic filter, build more of the WHERE clause
@@ -1478,37 +1512,6 @@ sub flatten {
$where .= "$key ${NOT}IN (" . join(',', map { $self->QueryParser->quote_value($_) } @{$filter->args}) . ')';
}
- } elsif ($filter->name eq 'site') {
- if (@{$filter->args} == 1) {
- if (!defined($depth_filter) or $depth_filter > 0) { # no point in filtering by "all"
- my $sitename = $filter->args->[0];
-
- my $ot = $U->get_org_tree;
- my $site_org = $U->find_org_by_shortname($ot, $sitename);
-
- if ($site_org and $site_org->id != $ot->id) { # no point in filtering by "all"
- my $dorgs = $U->get_org_descendants($site_org->id, $depth_filter);
- my $aorgs = $U->get_org_ancestors($site_org->id);
-
- my $negate = $filter->negate ? 'TRUE' : 'FALSE';
- 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)
- and $U->is_true($luri_as_copy_gf->value)
- );
-
- $uses_bre = 1;
- push @{$vis_filter{'b_attr'}},
- "search.calculate_visibility_attribute_test('luri_org','{".join(',', @$lorgs)."}',$negate)";
- }
- }
- }
-
} elsif ($filter->name eq 'locations') {
if (@{$filter->args} > 0) {
my $negate = $filter->negate ? 'TRUE' : 'FALSE';
-----------------------------------------------------------------------
Summary of changes:
.../Application/Storage/Driver/Pg/QueryParser.pm | 75 ++++++++++----------
1 files changed, 37 insertions(+), 38 deletions(-)
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list