Attachment 16125 Details for Bug 9239 – Bug 9239 QA follow-up: better error handling

[patch] Bug 9239 QA follow-up: better error handling

Bug-9239-QA-follow-up-better-error-handling.patch (text/plain), 1.96 KB, created by Jared Camins-Esakov on 2013-03-14 12:45:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jared Camins-Esakov

Created: 2013-03-14 12:45:08 UTC

Size: 1.96 KB

patch

obsolete

>From 65e8d2414fde1021bc6c9384ad4ed4f35b941cb8 Mon Sep 17 00:00:00 2001
>From: Jared Camins-Esakov <jcamins@cpbibliography.com>
>Date: Thu, 14 Mar 2013 08:43:13 -0400
>Subject: [PATCH] Bug 9239 QA follow-up: better error handling
>
>* Fix a long-standing bug in the linker that could crash the linker when
>run against odd data.
>* Sanitize input to SimpleSearch.
>* Correctly handle CCL indexes with QP.
>---
> C4/AuthoritiesMarc.pm |    1 +
> C4/Search.pm          |    3 ++-
> 2 files changed, 3 insertions(+), 1 deletion(-)
>
>diff --git a/C4/AuthoritiesMarc.pm b/C4/AuthoritiesMarc.pm
>index e30c571..68dcfb4 100644
>--- a/C4/AuthoritiesMarc.pm
>+++ b/C4/AuthoritiesMarc.pm
>@@ -1213,6 +1213,7 @@ sub GetAuthorizedHeading {
>     unless ($record = $args->{record}) {
>         return unless $args->{authid};
>         $record = GetAuthority($args->{authid});
>+        return unless $record;
>     }
>     if (C4::Context->preference('marcflavour') eq 'UNIMARC') {
> # construct UNIMARC summary, that is quite different from MARC21 one
>diff --git a/C4/Search.pm b/C4/Search.pm
>index dfb51da..aa69742 100644
>--- a/C4/Search.pm
>+++ b/C4/Search.pm
>@@ -250,6 +250,7 @@ sub SimpleSearch {
>                     $query = $QParser->target_syntax($servers[$i]);
>                     $zoom_queries[$i] = new ZOOM::Query::PQF( $query, $zconns[$i]);
>                 } else {
>+                    $query =~ s/:/=/g;
>                     $zoom_queries[$i] = new ZOOM::Query::CCL2RPN( $query, $zconns[$i]);
>                 }
>                 $tmpresults[$i] = $zconns[$i]->search( $zoom_queries[$i] );
>@@ -1176,7 +1177,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 ($query =~ m/^(ccl=|pqf=|cql=)/ || grep (/\w,\w|\w=\w/, @operands, @indexes) );
>     undef $QParser if (scalar @limits > 0);
> 
>     if ($QParser)
>-- 
>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