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

[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  b71ae38b20b0d4bc9a6ee8f8a84b2a5a68f44997 (commit)
      from  cc9af130212128a4941526da9f79938001adf140 (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 b71ae38b20b0d4bc9a6ee8f8a84b2a5a68f44997
Author: Dan Scott <dscott at laurentian.ca>
Date:   Thu Sep 6 23:37:32 2012 -0400

    Journal title hackery - move to a more robust location
    
    The fix for bug #1044721 broke the journal title hack, which probably
    should have lived where this commit moves it - if, in the age of filter
    groups, we decide whether it's worthwhile to keep it alive at all.
    
    Signed-off-by: Dan Scott <dscott at laurentian.ca>
    Signed-off-by: Dan Wells <dbw2 at calvin.edu>

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 e66fee2..173e194 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Search.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Search.pm
@@ -47,11 +47,6 @@ sub _prepare_biblio_search_basics {
         }
         $query = "$qtype:$query" unless $qtype eq 'keyword' and $i == 0;
 
-        # Hack for journal title - completed!
-        if ($q eq 'jtitle') {
-            $query = "bib_level:s $query";
-        }
-
         $bool = ($bool and $bool eq 'or') ? '||' : '&&';
         $full_query = $full_query ? "($full_query $bool $query)" : $query;
     }
@@ -92,6 +87,11 @@ sub _prepare_biblio_search {
         $query .= " container(bre,bookbag," . int($cgi->param("bookbag")) . ")";
     }
 
+    # Journal title hackery complete
+    if ($cgi->param("qtype") && $cgi->param("qtype") eq "jtitle") {
+        $query .= " bib_level(s)";
+    }
+
     if ($cgi->param('pubdate') && $cgi->param('date1')) {
         if ($cgi->param('pubdate') eq 'between') {
             $query .= ' between(' . $cgi->param('date1');

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

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


hooks/post-receive
-- 
Evergreen ILS