Attachment 123139 Details for Bug 22801 – Bug 22801: (follow-up) Use date-of-publication directly

[patch] Bug 22801: (follow-up) Use date-of-publication directly

Bug-22801-follow-up-Use-date-of-publication-direct.patch (text/plain), 2.72 KB, created by Kyle M Hall (khall) on 2021-07-23 15:06:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kyle M Hall (khall)

Created: 2021-07-23 15:06:59 UTC

Size: 2.72 KB

patch

obsolete

>From e938ed228fdc60770be04335918cf01d75d3dc7d Mon Sep 17 00:00:00 2001
>From: Nick Clemens <nick@bywatersolutions.com>
>Date: Thu, 17 Jun 2021 12:36:01 +0000
>Subject: [PATCH] Bug 22801: (follow-up) Use date-of-publication directly
>
>Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
>
>Signed-off-by: David Nind <david@davidnind.com>
>
>Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
>---
> Koha/SearchEngine/Elasticsearch/QueryBuilder.pm            | 7 ++-----
> .../Koha/SearchEngine/Elasticsearch/QueryBuilder.t         | 2 +-
> 2 files changed, 3 insertions(+), 6 deletions(-)
>
>diff --git a/Koha/SearchEngine/Elasticsearch/QueryBuilder.pm b/Koha/SearchEngine/Elasticsearch/QueryBuilder.pm
>index 56a3997ad9..2a0775d386 100644
>--- a/Koha/SearchEngine/Elasticsearch/QueryBuilder.pm
>+++ b/Koha/SearchEngine/Elasticsearch/QueryBuilder.pm
>@@ -994,9 +994,6 @@ The argument should be an arrayref, and it'll return an arrayref.
> sub _fix_limit_special_cases {
>     my ( $self, $limits ) = @_;
> 
>-    # yr is usually an alias of a search field
>-    my $yrfield = ( exists $index_field_convert{'yr'} ) ? $index_field_convert{'yr'} : 'yr';
>-
>     my @new_lim;
>     foreach my $l (@$limits) {
> 
>@@ -1005,13 +1002,13 @@ sub _fix_limit_special_cases {
>             my ( $start, $end ) =
>               ( $l =~ /^yr,st-numeric,ge=(.*) and yr,st-numeric,le=(.*)$/ );
>             next unless defined($start) && defined($end);
>-            push @new_lim, "$yrfield:[$start TO $end]";
>+            push @new_lim, "date-of-publication:[$start TO $end]";
>         }
>         elsif ( $l =~ /^yr,st-numeric=/ ) {
>             my ($date) = ( $l =~ /^yr,st-numeric=(.*)$/ );
>             next unless defined($date);
>             $date = $self->_modify_string_by_type(type => 'st-year', operand => $date);
>-            push @new_lim, "$yrfield:$date";
>+            push @new_lim, "date-of-publication:$date";
>         }
>         elsif ( $l =~ /^available$/ ) {
>             push @new_lim, 'onloan:false';
>diff --git a/t/db_dependent/Koha/SearchEngine/Elasticsearch/QueryBuilder.t b/t/db_dependent/Koha/SearchEngine/Elasticsearch/QueryBuilder.t
>index d8922c3eee..8de1607f40 100755
>--- a/t/db_dependent/Koha/SearchEngine/Elasticsearch/QueryBuilder.t
>+++ b/t/db_dependent/Koha/SearchEngine/Elasticsearch/QueryBuilder.t
>@@ -337,7 +337,7 @@ subtest 'build_query tests' => sub {
>     ( undef, $query ) = $qb->build_query_compat( undef, ['2019-'], ['yr,st-year'], ['yr,st-numeric=-2019'] );
>     is(
>         $query->{query}{query_string}{query},
>-        '(date-of-publication:[2019 TO *]) AND copydate:[* TO 2019]',
>+        '(date-of-publication:[2019 TO *]) AND date-of-publication:[* TO 2019]',
>         'Open end year in year range of an st-year search is handled properly'
>     );
> 
>-- 
>2.30.1 (Apple Git-130)

Actions: View | Diff | Splinter Review

Attachments on bug 22801: 115666 | 122064 | 122065 | 122066 | 122069 | 122070 | 123138 | 123139