[open-ils-commits] r9817 - in branches/acq-experiment: . Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher Open-ILS/src/support-scripts

[svn at svn.open-ils.org]

Author: erickson
Date: 2008-06-12 15:50:22 -0400 (Thu, 12 Jun 2008)
New Revision: 9817

Modified:
   branches/acq-experiment/
   branches/acq-experiment/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/metabib.pm
   branches/acq-experiment/Open-ILS/src/support-scripts/settings-tester.pl
Log:
Merged revisions 9815-9816 via svnmerge from 
svn://svn.open-ils.org/ILS/trunk

........
  r9815 | erickson | 2008-06-11 12:13:11 -0400 (Wed, 11 Jun 2008) | 1 line
  
  wrapping array items in quotes so empty chars will be valid stored proc array elements
........
  r9816 | erickson | 2008-06-12 09:02:23 -0400 (Thu, 12 Jun 2008) | 1 line
  
  warn if libdbi is not found by "locate"
........



Property changes on: branches/acq-experiment
___________________________________________________________________
Name: svnmerge-integrated
   - /trunk:1-9810
   + /trunk:1-9816

Modified: branches/acq-experiment/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/metabib.pm
===================================================================
--- branches/acq-experiment/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/metabib.pm	2008-06-12 13:02:23 UTC (rev 9816)
+++ branches/acq-experiment/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/metabib.pm	2008-06-12 19:50:22 UTC (rev 9817)
@@ -2442,15 +2442,15 @@
 
 	my $param_search_ou = $ou;
 	my $param_depth = $args{depth}; $param_depth = 'NULL' unless (defined($param_depth) and length($param_depth) > 0 );
-    my $param_searches = OpenSRF::Utils::JSON->perl2JSON( \%stored_proc_search_args ); $param_searches =~ s/\$//go; $param_searches = '$$'.$param_searches.'$$';
-    my $param_statuses = '$${' . join(',', map { s/\$//go; $_ } @statuses) . '}$$';
-    my $param_audience = '$${' . join(',', map { s/\$//go; $_ } @aud) . '}$$';
-    my $param_language = '$${' . join(',', map { s/\$//go; $_ } @lang) . '}$$';
-    my $param_lit_form = '$${' . join(',', map { s/\$//go; $_ } @lit_form) . '}$$';
-    my $param_types = '$${' . join(',', map { s/\$//go; $_ } @types) . '}$$';
-    my $param_forms = '$${' . join(',', map { s/\$//go; $_ } @forms) . '}$$';
-    my $param_vformats = '$${' . join(',', map { s/\$//go; $_ } @vformats) . '}$$';
-    my $param_bib_level = '$${' . join(',', map { s/\$//go; $_ } @bib_level) . '}$$';
+	my $param_searches = OpenSRF::Utils::JSON->perl2JSON( \%stored_proc_search_args ); $param_searches =~ s/\$//go; $param_searches = '$$'.$param_searches.'$$';
+	my $param_statuses = '$${' . join(',', map { s/\$//go; "\"$_\""} @statuses) . '}$$';
+	my $param_audience = '$${' . join(',', map { s/\$//go; "\"$_\"" } @aud) . '}$$';
+	my $param_language = '$${' . join(',', map { s/\$//go; "\"$_\""} @lang) . '}$$';
+	my $param_lit_form = '$${' . join(',', map { s/\$//go; "\"$_\"" } @lit_form) . '}$$';
+	my $param_types = '$${' . join(',', map { s/\$//go; "\"$_\""} @types) . '}$$';
+	my $param_forms = '$${' . join(',', map { s/\$//go; "\"$_\""} @forms) . '}$$';
+	my $param_vformats = '$${' . join(',', map { s/\$//go; "\"$_\"" } @vformats) . '}$$';
+    my $param_bib_level = '$${' . join(',', map { s/\$//go; "\"$_\"" } @bib_level) . '}$$';
 	my $param_pref_lang = $args{preferred_language}; $param_pref_lang =~ s/\$//go; $param_pref_lang = '$$'.$param_pref_lang.'$$';
 	my $param_pref_lang_multiplier = $args{preferred_language_weight}; $param_pref_lang_multiplier ||= 'NULL';
 	my $param_sort = $args{'sort'}; $param_sort =~ s/\$//go; $param_sort = '$$'.$param_sort.'$$';

Modified: branches/acq-experiment/Open-ILS/src/support-scripts/settings-tester.pl
===================================================================
--- branches/acq-experiment/Open-ILS/src/support-scripts/settings-tester.pl	2008-06-12 13:02:23 UTC (rev 9816)
+++ branches/acq-experiment/Open-ILS/src/support-scripts/settings-tester.pl	2008-06-12 19:50:22 UTC (rev 9817)
@@ -243,6 +243,11 @@
 sub check_libdbd {
 	my $results = '';
 	my @location = `locate libdbdpgsql.so | grep -v home | grep -v .libs`; # simple(ton) attempt to filter out build versions
+    unless(@location) {
+        my $res = "Libdbi postgres driver not found\n";
+        print $res;
+        return $res;
+    }
 	if (scalar(@location) > 1) {
 
 		my $res = "Found more than one location for libdbdpgsql.so.