From 2ff0677f7f0dcab993624043f650a66b9d7e9325 Mon Sep 17 00:00:00 2001
From: Petro Vashchuk <stalkernoid@gmail.com>
Date: Mon, 6 Sep 2021 16:46:45 +0300
Subject: [PATCH] Bug 28316: escape ES ranges if QueryAutoTruncate is enabled

if QueryAutoTruncate enabled we will have any special operators ruined
for example: "test [6 TO 7]" will be converted to "test* [6* TO* 7]"
so no reason to keep ranges when QueryAutoTruncate set to "enabled"

1) enable QueryAutoTruncate at your sysprefs.
2) perform a search using range, for example: "[1999 TO 2020]",
it shouldn't work the way it's supposed to.
3) apply the patch.
4) perform the same search with range, ensure that it works correctly.

Signed-off-by: Alex Buckley <alexbuckley@catalyst.net.nz>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit e84759dfee9a4323a17146b88aba9d717ca0bb75)
Signed-off-by: Victor Grousset/tuxayo <victor@tuxayo.net>
---
 .../Elasticsearch/QueryBuilder.pm             | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/Koha/SearchEngine/Elasticsearch/QueryBuilder.pm b/Koha/SearchEngine/Elasticsearch/QueryBuilder.pm
index d6f28ac38f..150f67ff7c 100644
--- a/Koha/SearchEngine/Elasticsearch/QueryBuilder.pm
+++ b/Koha/SearchEngine/Elasticsearch/QueryBuilder.pm
@@ -939,7 +939,28 @@ sub _clean_search_term {
     }
     $term = $self->_query_regex_escape_process($term);
 
+    # because of _truncate_terms and if QueryAutoTruncate enabled
+    # we will have any special operators ruined by _truncate_terms:
+    # for ex. search for "test [6 TO 7]" will be converted to "test* [6* TO* 7]"
+    # so no reason to keep ranges in QueryAutoTruncate==true case:
+    my $truncate = C4::Context->preference("QueryAutoTruncate") || 0;
+    unless($truncate) {
+        # replace all ranges with any square/curly brackets combinations to temporary substitutions (ex: "{a TO b]"" -> "~~LC~~a TO b~~RS~~")
+        # (where L is for left and C is for Curly and so on)
+        $term =~ s/
+            (?<!\\)
+            (?<backslashes>(?:[\\]{2})*)
+            (?<leftbracket>\{|\[)
+            (?<ranges>
+                [^\s\[\]\{\}]+\ TO\ [^\s\[\]\{\}]+
+                (?<!\\)
+                (?:[\\]{2})*
+            )
+            (?<rightbracket>\}|\])
+        /$+{backslashes}.'~~L'.($+{leftbracket} eq '[' ? 'S':'C').'~~'.$+{ranges}.'~~R'.($+{rightbracket} eq ']' ? 'S':'C').'~~'/gex;
+    }
     # save all regex contents away before escaping brackets:
+    # (same trick as with brackets above, just RE for 'RegularExpression')
     my @saved_regexes;
     my $rgx_i = 0;
     while(
@@ -974,6 +995,10 @@ sub _clean_search_term {
     for (my $i = 0; $i < @saved_regexes; $i++) {
         $term =~ s/~~RE$i~~/$saved_regexes[$i]/;
     }
+    unless($truncate) {
+        # restore temporary weird substitutions back to normal brackets
+        $term =~ s/~~L(C|S)~~([^\s\[\]\{\}]+ TO [^\s\[\]\{\}]+)~~R(C|S)~~/($1 eq 'S' ? '[':'{').$2.($3 eq 'S' ? ']':'}')/ge;
+    }
     return $term;
 }
 
-- 
2.39.5