[open-ils-commits] [GIT] Evergreen ILS branch master updated. d8de66599444d919e854eb511403165cc258ace0

[Evergreen Git]

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  d8de66599444d919e854eb511403165cc258ace0 (commit)
      from  4d6a92a19ba39f211673b55313c43726a274ee53 (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 d8de66599444d919e854eb511403165cc258ace0
Author: Galen Charlton <gmc at equinoxinitiative.org>
Date:   Mon Jan 22 18:01:00 2018 -0500

    LP#1745207: tie together copy_tag() and site() search filters
    
    The copy_tag() filter will now restrict itself to records that
    have copies that both have matching copy tags and a circ_lib
    within the site() scope.
    
    To test
    -------
    [1] Define two digital bookplate copy tags at two difference org units, e.g.,
        "BR1 Smith" at BR1 and "BR4 Smith" at "BR4".
    [2] Arrange that a record has items in both BR1 and BR4, and assign the "BR4 Smith"
        copy tag to one of the BR4 items.
    [3] On a separate record, set up a similar situation, but use BR1 instead.
    [4] Enable the digital bookplate search option and do a bookplate search
        for "Smith" with the scope limited to BR1.
    [5] Note that both of the records set up in #2 and #3 are included in the results
        set.
    [6] Apply the patch and repeat step 5. This time, only the record set up in #3
        should be included.
    
    Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
    Signed-off-by: Garry Collum <gcollum at gmail.com>
    Signed-off-by: Chris Sharp <csharp at georgialibraries.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 6141d66..0d3c411 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
@@ -1598,6 +1598,7 @@ sub flatten {
                     $with .= "             JOIN asset.copy cp ON (acptcm.copy = cp.id)\n";
                     $with .= "             JOIN asset.call_number cn ON (cp.call_number = cn.id)\n";
                     $with .= "       WHERE 1 = 1 \n";
+                    $with .= "       AND cp.circ_lib IN (" . join(',', @$dorgs) . ")\n";
                     if ($copy_tag_type ne '*') {
                         $with .= "             AND cctt.code = " . $self->QueryParser->quote_value($copy_tag_type) . "\n";
                     }

-----------------------------------------------------------------------

Summary of changes:
 .../Application/Storage/Driver/Pg/QueryParser.pm   |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
Evergreen ILS