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

[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  767a65660d0b6f5a3b04243e0d7b6270f3c89b63 (commit)
      from  5dff6311f57bebf391647b3f3d1a67ffe01c5e75 (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 767a65660d0b6f5a3b04243e0d7b6270f3c89b63
Author: Mike Rylander <mrylander at gmail.com>
Date:   Wed Feb 29 12:04:54 2012 -0500

    Protect against empty default_CD_modifiers in opensrf.xml
    
    If the app settings for the open-ils.search service in opensrf.xml had
    an empty (but not entirely missing) <default_CD_modifiers> element, then
    the open-ils.storage log would contain entries like the following:
    
    Use of uninitialized value $class in hash element at
    /usr/local/share/perl5/OpenILS/Application/Storage/QueryParser.pm
    
    Protect against that problem with more defensive code in QueryParser.pm.
    
    Signed-off-by: Mike Rylander <mrylander at gmail.com>
    Signed-off-by: Dan Scott <dan at coffeecode.net>

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Publisher/metabib.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Publisher/metabib.pm
index eb2602a..22b50f8 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Publisher/metabib.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Publisher/metabib.pm
@@ -2846,8 +2846,11 @@ sub query_parser_fts {
     my $default_CD_modifiers = OpenSRF::Utils::SettingsClient->new->config_value(
         apps => 'open-ils.search' => app_settings => 'default_CD_modifiers'
     );
-    $args{query} = "$default_CD_modifiers $args{query}" if ($default_CD_modifiers);
 
+    # Protect against empty / missing default_CD_modifiers setting
+    if ($default_CD_modifiers and !ref($default_CD_modifiers)) {
+        $args{query} = "$default_CD_modifiers $args{query}";
+    }
 
     my $simple_plan = $args{_simple_plan};
     # remove bad chunks of the %args hash

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

Summary of changes:
 .../Application/Storage/Publisher/metabib.pm       |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
Evergreen ILS