Attachment 112906 Details for Bug 24567 – Bug 24567: (QA follow-up) Remove warning in regex

[patch] Bug 24567: (QA follow-up) Remove warning in regex

Bug-24567-QA-follow-up-Remove-warning-in-regex.patch (text/plain), 1.36 KB, created by Joonas Kylmälä on 2020-11-03 10:35:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Joonas Kylmälä

Created: 2020-11-03 10:35:56 UTC

Size: 1.36 KB

patch

obsolete

>From a91b062e55562d91a560e98872366feabd7fe85e Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Joonas=20Kylm=C3=A4l=C3=A4?= <joonas.kylmala@helsinki.fi>
>Date: Tue, 3 Nov 2020 12:27:14 +0200
>Subject: [PATCH] Bug 24567: (QA follow-up) Remove warning in regex
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>Without this patch we get
>
>Use of uninitialized value $3 in concatenation (.) or string at /kohadevbox/koha/Koha/SearchEngine/Elasticsearch/QueryBuilder.pm line 943.
>
>This converts the | OR operator to two different regexes so that the
>capture group variables will be defined in every case.
>
>Signed-off-by: Joonas KylmÃ¤lÃ¤ <joonas.kylmala@helsinki.fi>
>---
> Koha/SearchEngine/Elasticsearch/QueryBuilder.pm | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
>diff --git a/Koha/SearchEngine/Elasticsearch/QueryBuilder.pm b/Koha/SearchEngine/Elasticsearch/QueryBuilder.pm
>index 39cf1d22a7..a087b19789 100644
>--- a/Koha/SearchEngine/Elasticsearch/QueryBuilder.pm
>+++ b/Koha/SearchEngine/Elasticsearch/QueryBuilder.pm
>@@ -940,7 +940,8 @@ sub _clean_search_term {
>     }
> 
>     # Remove unquoted colons that have whitespace on either side of them
>-    $term =~ s/((:+)(\s+)|(\s+)(:+))$lookahead/$3$4/g;
>+    $term =~ s/(:+)(\s+)$lookahead/$2/g;
>+    $term =~ s/(\s+)(:+)$lookahead/$1/g;
> 
>     $term = $self->_query_regex_escape_process($term);
> 
>-- 
>2.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 24567: 112562 | 112564 | 112832 | 112903 | 112904 | 112906