[open-ils-commits] r10179 - in trunk/Open-ILS/src: perlmods/OpenILS/Application/Storage/Publisher sql/Pg

[svn at svn.open-ils.org]

Author: miker
Date: 2008-07-29 16:56:38 -0400 (Tue, 29 Jul 2008)
New Revision: 10179

Modified:
   trunk/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/metabib.pm
   trunk/Open-ILS/src/sql/Pg/300.schema.staged_search.sql
Log:
preferred language and date filter fixes

Modified: trunk/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/metabib.pm
===================================================================
--- trunk/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/metabib.pm	2008-07-29 19:10:57 UTC (rev 10178)
+++ trunk/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/metabib.pm	2008-07-29 20:56:38 UTC (rev 10179)
@@ -2384,8 +2384,9 @@
 	my (@between, at statuses, at locations, at types, at forms, at lang, at aud, at lit_form, at vformats, at bib_level);
 
     if (!defined($args{preferred_language})) {
+		my $ses_locale = $client->session ? $client->session->session_locale : $default_preferred_language;
         $args{preferred_language} =
-            $locale_map{ $client->session->session_locale || $default_preferred_language } || 'eng';
+            $locale_map{ $ses_locale } || 'eng';
     }
 
     if (!defined($args{preferred_language_weight})) {

Modified: trunk/Open-ILS/src/sql/Pg/300.schema.staged_search.sql
===================================================================
--- trunk/Open-ILS/src/sql/Pg/300.schema.staged_search.sql	2008-07-29 19:10:57 UTC (rev 10178)
+++ trunk/Open-ILS/src/sql/Pg/300.schema.staged_search.sql	2008-07-29 20:56:38 UTC (rev 10179)
@@ -344,7 +344,7 @@
         where_clause = where_clause || $$ AND $$ || quote_literal(param_during) || $$ BETWEEN mrd.date1 AND mrd.date2 $$;
     END IF;
 
-    IF param_between IS NOT NULL AND array_upper(param_between, 1) > 0 THEN
+    IF param_between IS NOT NULL AND array_upper(param_between, 1) > 1 THEN
         where_clause = where_clause || $$ AND mrd.date1 BETWEEN $$ || array_to_string(param_bib_level, $$' AND '$$) || ' ';
     END IF;