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

[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  9ea87436847f7335d154bd3ab9a05505ec5812bf (commit)
       via  743bae4691dd37124e9184b4eeb4bb54599bc158 (commit)
      from  4a0c30d4914d740bd8e2464706b149724bb6efdc (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 9ea87436847f7335d154bd3ab9a05505ec5812bf
Author: Bill Erickson <berick at esilibrary.com>
Date:   Wed Oct 26 14:56:01 2011 -0400

    Z39.50 service filter repairs
    
    Do not attempt to filter out Z39.50 services by permission when
    retrieveing the services in a non-authenticate manner (i.e. from within
    the Z39.50 code).  Otherwise, the code will die on $e->requestor->id,
    because there is no requestor.
    
    Signed-off-by: Bill Erickson <berick at esilibrary.com>
    Signed-off-by: Jason Etheridge <jason at esilibrary.com>

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Search/Z3950.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Search/Z3950.pm
index 6a09529..978b106 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Search/Z3950.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Search/Z3950.pm
@@ -157,16 +157,18 @@ sub fetch_service_defs {
     };
 
     # then filter out any services which the requestor lacks the perm for
-    foreach my $s (keys %{ $hash }) {
-        if ($$hash{$s}{use_perm}) {
-            if ($U->check_perms(
-                $e->requestor->id,
-                $e->requestor->ws_ou,
-                $$hash{$s}{use_perm}
-            )) {
-                delete $$hash{$s};
-            }
-        };
+    if ($editor_with_authtoken) {
+        foreach my $s (keys %{ $hash }) {
+            if ($$hash{$s}{use_perm}) {
+                if ($U->check_perms(
+                    $e->requestor->id,
+                    $e->requestor->ws_ou,
+                    $$hash{$s}{use_perm}
+                )) {
+                    delete $$hash{$s};
+                }
+            };
+        }
     }
 
     %services = %$hash; # cache these internally so we can actually use the db-configured sources

commit 743bae4691dd37124e9184b4eeb4bb54599bc158
Author: Bill Erickson <berick at esilibrary.com>
Date:   Wed Oct 5 09:39:47 2011 -0400

    Z39.50 local catalog fetch-more repairs
    
    Fixes the following problem:
    
    When paging through local catalog results in the Z39.50 interface,
    paging off then end of the local results would result in an unknown
    server error caused by trying to retrieve an empty list of records.
    
    $list->{count} in this context is the overall hit count, not the counts
    in the current page of results.  Note also if {count} is zero, the list
    of IDs will be undef, so we use both.
    
    Signed-off-by: Bill Erickson <berick at esilibrary.com>
    Signed-off-by: Jason Etheridge <jason at esilibrary.com>

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Search/Biblio.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Search/Biblio.pm
index 780963b..dc45d3b 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Search/Biblio.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Search/Biblio.pm
@@ -956,7 +956,7 @@ sub cat_search_z_style_wrapper {
 
 	my $list = the_quest_for_knowledge( $self, $client, $searchhash );
 
-	if ($list->{count} > 0) {
+	if ($list->{count} > 0 and @{$list->{ids}}) {
 		$result->{count} = $list->{count};
 
 		my $records = $cstore->request(

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

Summary of changes:
 .../lib/OpenILS/Application/Search/Biblio.pm       |    2 +-
 .../lib/OpenILS/Application/Search/Z3950.pm        |   22 ++++++++++---------
 2 files changed, 13 insertions(+), 11 deletions(-)


hooks/post-receive
-- 
Evergreen ILS