[open-ils-commits] [GIT] Evergreen ILS branch rel_2_3 updated. 78103475da805ca9e59d7c94e531fdcc7b43260e

[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, rel_2_3 has been updated
       via  78103475da805ca9e59d7c94e531fdcc7b43260e (commit)
      from  32da2a9d0e78c1348cfd9b490f3100168c50b73c (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 78103475da805ca9e59d7c94e531fdcc7b43260e
Author: Bill Erickson <berick at esilibrary.com>
Date:   Wed Mar 27 16:26:28 2013 -0400

    LP 1160522 2.3 tpac search modifier query append
    
    Append search modifiers (e.g. limit to available) to the end of the
    tpac search query to avoid SQL generation issues with 2.3 series
    query parser.
    
    Signed-off-by: Bill Erickson <berick at esilibrary.com>
    Signed-off-by: Ben Shum <bshum at biblio.org>

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Search.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Search.pm
index c85a0bb..470426c 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Search.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Search.pm
@@ -61,10 +61,6 @@ sub _prepare_biblio_search {
 
     $query .= ' ' . $ctx->{global_search_filter} if $ctx->{global_search_filter};
 
-    foreach ($cgi->param('modifier')) {
-        # The unless bit is to avoid stacking modifiers.
-        $query = ('#' . $_ . ' ' . $query) unless $query =~ qr/\#\Q$_/;
-    }
 
     # filters
     foreach (grep /^fi:/, $cgi->param) {
@@ -168,6 +164,11 @@ sub _prepare_biblio_search {
         push @naive_query_re, $thing;
     }
 
+    foreach ($cgi->param('modifier')) {
+        # The unless bit is to avoid stacking modifiers.
+        $query .= " #$_" unless $query =~ qr/\#\Q$_/;
+    }
+
     # This gives templates a way to take site() and depth() back out of
     # query strings when they shouldn't be there (because they're controllable
     # with other widgets).

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

Summary of changes:
 .../perlmods/lib/OpenILS/WWW/EGCatLoader/Search.pm |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
Evergreen ILS