Attachment 16147 Details for Bug 9239 – [PASSED QA] Bug 9239 QA-follow-up: quiet warnings and fix problem with limits

[patch] [PASSED QA] Bug 9239 QA-follow-up: quiet warnings and fix problem with limits

PASSED-QA-Bug-9239-QA-follow-up-quiet-warnings-and.patch (text/plain), 2.44 KB, created by Katrin Fischer on 2013-03-14 21:37:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Katrin Fischer

Created: 2013-03-14 21:37:55 UTC

Size: 2.44 KB

patch

obsolete

>From 16a48dbf0fd81b96cd2a9aa2b024352f7a6a8ffb Mon Sep 17 00:00:00 2001
>From: Jared Camins-Esakov <jcamins@cpbibliography.com>
>Date: Thu, 7 Mar 2013 06:50:10 -0500
>Subject: [PATCH] [PASSED QA] Bug 9239 QA-follow-up: quiet warnings and fix
> problem with limits
>
>Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
>---
> C4/Search.pm                                   |    1 +
> Koha/QueryParser/Driver/PQF/query_plan/node.pm |    1 +
> opac/opac-search.pl                            |    4 +++-
> 3 files changed, 5 insertions(+), 1 deletion(-)
>
>diff --git a/C4/Search.pm b/C4/Search.pm
>index 9e8437b..eeea101 100644
>--- a/C4/Search.pm
>+++ b/C4/Search.pm
>@@ -1179,6 +1179,7 @@ sub parseQuery {
>     my $QParser;
>     $QParser = C4::Context->queryparser if (C4::Context->preference('UseQueryParser') || $query =~ s/^qp=//);
>     undef $QParser if ($query =~ m/^(ccl=|pqf=|cql=)/ || grep (/\w,\w|\w=\w/, @operands) );
>+    undef $QParser if (scalar @limits > 0);
> 
>     if ($QParser)
>     {
>diff --git a/Koha/QueryParser/Driver/PQF/query_plan/node.pm b/Koha/QueryParser/Driver/PQF/query_plan/node.pm
>index e93bb4b..7d694cd 100644
>--- a/Koha/QueryParser/Driver/PQF/query_plan/node.pm
>+++ b/Koha/QueryParser/Driver/PQF/query_plan/node.pm
>@@ -68,6 +68,7 @@ sub target_syntax {
>                 if ($atom_content) {
>                     $pqf .= ' @or ' x (scalar(@fields) - 1);
>                     foreach my $attributes (@fields) {
>+                        $attributes->{'attr_string'} ||= '';
>                         $pqf .= $attributes->{'attr_string'} . ($attributes->{'4'} ? '' : ' @attr 4=6 ') . $atom_content . ' ';
>                     }
>                     $atom_count++;
>diff --git a/opac/opac-search.pl b/opac/opac-search.pl
>index 4744ac6..6be3333 100755
>--- a/opac/opac-search.pl
>+++ b/opac/opac-search.pl
>@@ -837,7 +837,9 @@ if (C4::Context->preference('GoogleIndicTransliteration')) {
>         $template->param('GoogleIndicTransliteration' => 1);
> }
> 
>-$template->{VARS}->{DidYouMean} = C4::Context->preference('OPACdidyoumean') =~ m/enable/;
>+$template->{VARS}->{DidYouMean} =
>+  ( defined C4::Context->preference('OPACdidyoumean')
>+      && C4::Context->preference('OPACdidyoumean') =~ m/enable/ );
> $template->{VARS}->{IDreamBooksReviews} = C4::Context->preference('IDreamBooksReviews');
> $template->{VARS}->{IDreamBooksReadometer} = C4::Context->preference('IDreamBooksReadometer');
> $template->{VARS}->{IDreamBooksResults} = C4::Context->preference('IDreamBooksResults');
>-- 
>1.7.9.5

Actions: View | Diff | Splinter Review

Attachments on bug 9239: 14020 | 14021 | 14022 | 14023 | 14172 | 14173 | 14174 | 14175 | 14180 | 14181 | 14182 | 14183 | 14847 | 14949 | 14950 | 14951 | 14952 | 14953 | 15121 | 15437 | 15865 | 15867 | 15929 | 15999 | 16004 | 16051 | 16125 | 16130 | 16131 | 16132 | 16133 | 16136 | 16140 | 16141 | 16142 | 16143 | 16144 | 16145 | 16146 | 16147 | 16148 | 16149 | 16150 | 16151 | 16152 | 16153 | 16154 | 16155 | 16180 | 16181 | 16182 | 16183 | 16184 | 16185 | 16186 | 16187 | 16188 | 16189 | 16190 | 16191 | 16192 | 16193 | 16194 | 16195