From: Bill Erickson Date: Mon, 26 Feb 2018 15:12:38 +0000 (-0500) Subject: Revert "LP#1464709: teach QP about is_available statuses" X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=a5c7b0a4bfd99c316b33342a4373d4f0109e4e22;p=working%2FEvergreen.git Revert "LP#1464709: teach QP about is_available statuses" Retaining previous availabilty filtering behavior because KCLS uses is_available (previously checkout_ok) more liberally than suits a search availability filter. E.g. 'missing' is is_available=true This reverts commit fed65df3c669e1337f187d533e9033a697d6b263. --- 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 3ca3751f1f..3ebdd877a4 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 @@ -2863,14 +2863,6 @@ __PACKAGE__->register_method( } ); -my @available_statuses_cache; -sub available_statuses { - if (!scalar(@available_statuses_cache)) { - @available_statuses_cache = map { $_->id } config::copy_status->search_where({is_available => 't'}); - } - return @available_statuses_cache; -} - sub query_parser_fts { my $self = shift; my $client = shift; @@ -3045,11 +3037,10 @@ sub query_parser_fts { # gather statuses, and then forget those if we have an #available modifier my @statuses; - if ($query->parse_tree->find_modifier('available')) { - @statuses = available_statuses(); - } elsif (my ($filter) = $query->parse_tree->find_filter('statuses')) { + if (my ($filter) = $query->parse_tree->find_filter('statuses')) { @statuses = @{$filter->args} if (@{$filter->args}); } + @statuses = (0,7,12) if ($query->parse_tree->find_modifier('available')); # gather locations