From d2d539f6262bf25bc5c6745d3dca948f02af97b8 Mon Sep 17 00:00:00 2001 From: Alex Arnaud Date: Thu, 9 May 2019 12:39:51 +0000 Subject: [PATCH] Bug 22874 - use false instaed of 0 value for limiting on availability Test plan - Set up a elasticsearch 6 instance to work with Koha, - you may need to make koha works with ES 6 (see bug 20589), - make a search and limit it to available items only, => no result - Apply this patch, - make a search and limit it to available items only, - you should get some results - Do the same with ES 5.x --- Koha/SearchEngine/Elasticsearch/QueryBuilder.pm | 2 +- t/db_dependent/Koha/SearchEngine/Elasticsearch/QueryBuilder.t | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Koha/SearchEngine/Elasticsearch/QueryBuilder.pm b/Koha/SearchEngine/Elasticsearch/QueryBuilder.pm index 084d5ad..e903f4a 100644 --- a/Koha/SearchEngine/Elasticsearch/QueryBuilder.pm +++ b/Koha/SearchEngine/Elasticsearch/QueryBuilder.pm @@ -872,7 +872,7 @@ sub _fix_limit_special_cases { push @new_lim, "copydate:$date"; } elsif ( $l =~ /^available$/ ) { - push @new_lim, 'onloan:0'; + push @new_lim, 'onloan:false'; } else { push @new_lim, $l; diff --git a/t/db_dependent/Koha/SearchEngine/Elasticsearch/QueryBuilder.t b/t/db_dependent/Koha/SearchEngine/Elasticsearch/QueryBuilder.t index df2f323..182eb5e 100644 --- a/t/db_dependent/Koha/SearchEngine/Elasticsearch/QueryBuilder.t +++ b/t/db_dependent/Koha/SearchEngine/Elasticsearch/QueryBuilder.t @@ -282,10 +282,10 @@ subtest 'build_query tests' => sub { "query of just '*' is unaltered when QueryAutoTruncate is enabled" ); - ( undef, $query ) = $qb->build_query_compat( undef, ['"donald duck"'] ); + ( undef, $query ) = $qb->build_query_compat( undef, ['"donald duck"'], undef, ['available'] ); is( $query->{query}{query_string}{query}, - '("donald duck")', + '("donald duck") AND onloan:false', "query with quotes is unaltered when QueryAutoTruncate is enabled" ); -- 2.7.4