gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 30152: Elasticsearch - queries with OR don't work with limits 

When a query with "OR" is combined with a limit in Elasticsearch, the precedence is not preserved and the results are not correct.

To test:
1) Set SearchEngine to Elasticsearch
2) Index records in Elasticsearch
3) Do an advanced search
4) Select More options
5) Enter a value for the first Keyword (e.g. Novels)
6) Change "and" before the second Keyword to "or"
7) Enter another value for the second Keyword (e.g. Prose)
8) Limit the search (e.g. Item type Books)
9) Do the search
10) Observe that records with the first keyword are not in the results
11) Apply the patch
12) Repeat the search
13) Observe that results with both keywords are in the results
14) Sign off

Sponsored-by: Lund University Library

Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
(cherry picked from commit 3ed649a0e0)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
This commit is contained in:
Kevin Carnes 2022-02-22 14:29:15 +01:00 committed by Lucas Gass
parent 98883753a0
commit d6a3a10fc7
2 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Koha/SearchEngine/Elasticsearch/QueryBuilder.pm
View File

@ -305,10 +305,16 @@ sub build_query_compat {
# would be to pass them separately into build_query and let it build
# them into a structured ES query itself. Maybe later, though that'd be
# more robust.
$search_param_query_str = join( ' ', $self->_create_query_string(@search_params) );
my @search_param_query_array = $self->_create_query_string(@search_params);
$search_param_query_str = join( ' ', @search_param_query_array );
my $search_param_limit_str =
$self->_join_queries( $self->_convert_index_strings(@$limits) );
if ( @search_param_query_array > 1 && $search_param_limit_str ) {
$search_param_query_str = "($search_param_query_str)";
}
$query_str = join( ' AND ',
$search_param_query_str || (),
$self->_join_queries( $self->_convert_index_strings(@$limits) ) || () );
$search_param_limit_str || () );
# If there's no query on the left, let's remove the junk left behind
$query_str =~ s/^ AND //;

16
t/db_dependent/Koha/SearchEngine/Elasticsearch/QueryBuilder.t
View File

@ -215,7 +215,7 @@ subtest 'build_authorities_query_compat() tests' => sub {
};
subtest 'build_query tests' => sub {
plan tests => 57;
plan tests => 59;
my $qb;
@ -494,6 +494,20 @@ subtest 'build_query tests' => sub {
"Limits quoted correctly when passed as phrase"
);
( undef, $query ) = $qb->build_query_compat( ['OR'], ['title:"donald duck"', 'author:"Dillinger Escaplan"'], undef, ['itype:BOOK'] );
is(
$query->{query}{query_string}{query},
'((title:"donald duck") OR (author:"Dillinger Escaplan")) AND itype:("BOOK")',
"OR query with limit"
);
( undef, $query ) = $qb->build_query_compat( undef, undef, undef, ['itype:BOOK'] );
is(
$query->{query}{query_string}{query},
'itype:("BOOK")',
"Limit only"
);
# Scan queries
( undef, $query, $simple_query, $query_cgi, $query_desc ) = $qb->build_query_compat( undef, ['new'], ['au'], undef, undef, 1 );
is(