[open-ils-commits] [GIT] Evergreen ILS branch rel_2_2 updated. 3c71b24ffb06049587db24c7bd4d70d135e6f790

[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_2 has been updated
       via  3c71b24ffb06049587db24c7bd4d70d135e6f790 (commit)
      from  7fae54ad0523f26c5202cffd5d06be8039e500cf (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 3c71b24ffb06049587db24c7bd4d70d135e6f790
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