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

[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  17f090a2d8ffba0a70f3254d55d49e99b7282a15 (commit)
       via  a1d4da3f18a282ee6e1ce1bd723b3d8ed0fccfec (commit)
      from  e3bf3c5f473a2c1f1651336be5b8eb966415c4db (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 17f090a2d8ffba0a70f3254d55d49e99b7282a15
Author: Dan Scott <dscott at laurentian.ca>
Date:   Sat Aug 4 11:04:17 2012 -0400

    Silence warnings in search results for holdable copies
    
    Have not yet determined the exact reason the holdable copies size is not
    defined in some instances in the search results only, but this commit
    prevents warnings from being spewed by apache about undefined variables.
    
    Signed-off-by: Dan Scott <dscott at laurentian.ca>
    Signed-off-by: Bill Erickson <berick at esilibrary.com>

diff --git a/Open-ILS/src/templates/opac/parts/result/table.tt2 b/Open-ILS/src/templates/opac/parts/result/table.tt2
index 225c21a..bc52adb 100644
--- a/Open-ILS/src/templates/opac/parts/result/table.tt2
+++ b/Open-ILS/src/templates/opac/parts/result/table.tt2
@@ -217,8 +217,9 @@
                                                 <div class="result_table_utils_cont">
                                                     <div class="result_table_utils">
 [%- search_ou = ctx.search_ou;
+    num_holdable_copies = attrs.marc_xml.findnodes('//*[local-name()="holdings" and @has_holdable="true"]').size || 0;
     IF ctx.place_unfillable ||
-        ( attrs.marc_xml.findnodes('//*[local-name()="holdings" and @has_holdable="true"]').size > 0
+        ( num_holdable_copies > 0
             && (ctx.holds_block.enabled != 'true' || attrs.org_copy_counts.$search_ou.available == 0)
         )
 %]

commit a1d4da3f18a282ee6e1ce1bd723b3d8ed0fccfec
Author: Dan Scott <dscott at laurentian.ca>
Date:   Sat Aug 4 10:43:31 2012 -0400

    TPAC: Silence two uninit variable warnings
    
    These warnings were being thrown on every TPAC page request, slowly
    filling the logs:
    
    Use of uninitialized value $set_locale in string eq at
    /usr/local/share/perl/5.10.1/OpenILS/WWW/EGWeb.pm line 159.
    
    Use of uninitialized value in pattern match (m//) at
    /usr/local/share/perl/5.10.1/OpenILS/WWW/EGCatLoader.pm line 250.
    
    Banish them.
    
    Signed-off-by: Dan Scott <dscott at laurentian.ca>
    Signed-off-by: Bill Erickson <berick at esilibrary.com>

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader.pm
index 8d577da..f7220b1 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader.pm
@@ -247,7 +247,8 @@ sub load_common {
     $ctx->{full_path} = $ctx->{base_path} . $self->cgi->path_info;
     $ctx->{unparsed_uri} = $self->apache->unparsed_uri;
     $ctx->{opac_root} = $ctx->{base_path} . "/opac"; # absolute base url
-    $ctx->{is_staff} = ($self->apache->headers_in->get('OILS-Wrapper') =~ /true/);
+    my $oils_wrapper = $self->apache->headers_in->get('OILS-Wrapper') || '';
+    $ctx->{is_staff} = ($oils_wrapper =~ /true/);
     $ctx->{proto} = 'oils' if $ctx->{is_staff};
     $ctx->{physical_loc} = $self->get_physical_loc;
 
diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGWeb.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGWeb.pm
index 1baf0ab..25285b1 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGWeb.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGWeb.pm
@@ -154,7 +154,7 @@ sub load_context {
     $ctx->{locales} = \%registered_locales;
 
     # Set a locale cookie if the requested locale is valid
-    my $set_locale = $cgi->param('set_eg_locale');
+    my $set_locale = $cgi->param('set_eg_locale') || '';
     if (!(grep {$_ eq $set_locale} keys %registered_locales)) {
         $set_locale = '';
     } else {

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

Summary of changes:
 .../src/perlmods/lib/OpenILS/WWW/EGCatLoader.pm    |    3 ++-
 Open-ILS/src/perlmods/lib/OpenILS/WWW/EGWeb.pm     |    2 +-
 Open-ILS/src/templates/opac/parts/result/table.tt2 |    3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
Evergreen ILS