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

[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  a30dcca536acc833d6323763485e3d63b1c37574 (commit)
      from  2f60ce5813ef2b0435d00c99a7d8ff698a8431d9 (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 a30dcca536acc833d6323763485e3d63b1c37574
Author: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
Date:   Tue Apr 3 11:16:16 2012 -0400

    Fix failure of 'My Selection Lists' interface
    
    Addresses this bug: https://bugs.launchpad.net/evergreen/+bug/967824
    
    Recent changes to the mechanism of unified search (for which 'My
    Selection Lists' is a frontend) lacked code that respected
    the new join structure for some use cases.
    
    Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
    Signed-off-by: Bill Erickson <berick at esilibrary.com>

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Acq/Search.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Acq/Search.pm
index fdad64f..109284c 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Acq/Search.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Acq/Search.pm
@@ -267,14 +267,7 @@ sub add_au_joins {
     my $n = 0;
     foreach my $join (@_) {
         my ($hint, $attr, $num) = @$join;
-        my $start;
-        if ($hint eq "jub") {
-            $start = $from->{$hint};
-        } elsif ($hint eq "acqinv") {
-            $start = $from->{"jub"}->{"acqie"}->{"join"}->{$hint};
-        } else {
-            $start = $from->{"jub"}->{$hint};
-        }
+        my $start = $from->{"acqus"}{$hint};
         my $clause = {
             "class" => "au",
             "type" => "left",
@@ -289,12 +282,8 @@ sub add_au_joins {
                 }
             }
         };
-        if ($hint eq "jub") {
-            $start->{"au$num"} = $clause;
-        } else {
-            $start->{"join"} ||= {};
-            $start->{"join"}->{"au$num"} = $clause;
-        }
+        $start->{"join"} ||= {};
+        $start->{"join"}->{"au$num"} = $clause;
         $n++;
     }
     $n;
@@ -417,7 +406,7 @@ q/order_by clause must be of the long form, like:
 
     $and_terms = prepare_terms($and_terms, 1);
     $or_terms = prepare_terms($or_terms, 0) and do {
-        $query->{"from"}->{"jub"}->{"acqlia"} = {
+        $query->{"from"}{"acqus"}{"jub"}{"join"}{"acqlia"} = {
             "type" => "left", "field" => "lineitem", "fkey" => "id",
         };
     };

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

Summary of changes:
 .../perlmods/lib/OpenILS/Application/Acq/Search.pm |   19 ++++---------------
 1 files changed, 4 insertions(+), 15 deletions(-)


hooks/post-receive
-- 
Evergreen ILS