Browse Source

Bug 25669: (follow-up) Minor fixes

Bulk doesn't support include_type_name, update requirement to
Search::Elasticseach@6.80, and remove data type name from tests.

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
22.11.x
Kevin Carnes 9 months ago
committed by Tomas Cohen Arazi
parent
commit
e926de5e8f
  1. 1
      Koha/SearchEngine/Elasticsearch/Indexer.pm
  2. 2
      cpanfile
  3. 2
      t/db_dependent/Koha/SearchEngine/Elasticsearch.t
  4. 86
      t/db_dependent/Koha/SearchEngine/Elasticsearch/QueryBuilder.t
  5. 38
      t/db_dependent/Koha/SearchEngine/Elasticsearch/Search.t

1
Koha/SearchEngine/Elasticsearch/Indexer.pm

@ -355,7 +355,6 @@ sub delete_index {
my $result = $elasticsearch->bulk(
index => $self->index_name,
type => 'data',
include_type_name => JSON::true(),
body => \@body,
);
if ($result->{errors}) {

2
cpanfile

@ -94,7 +94,7 @@ requires 'Plack::Middleware::LogWarn', '0.001002';
requires 'Plack::Middleware::ReverseProxy', '0.14';
requires 'Readonly', '2.00';
requires 'Schedule::At', '1.06';
requires 'Search::Elasticsearch', '6.00';
requires 'Search::Elasticsearch', '6.80';
requires 'Sereal::Decoder', '3.0';
requires 'Sereal::Encoder', '3.0';
requires 'Storable', '2.20';

2
t/db_dependent/Koha/SearchEngine/Elasticsearch.t

@ -135,7 +135,7 @@ subtest 'get_elasticsearch_mappings() tests' => sub {
# test reading mappings
my $es = Koha::SearchEngine::Elasticsearch->new( {index => $Koha::SearchEngine::Elasticsearch::BIBLIOS_INDEX} );
$mappings = $es->get_elasticsearch_mappings();
is( $mappings->{data}{properties}{isbn__sort}{index}, 'false', 'Field mappings parsed correctly' );
is( $mappings->{properties}{isbn__sort}{index}, 'false', 'Field mappings parsed correctly' );
};
subtest 'Koha::SearchEngine::Elasticsearch::marc_records_to_documents () tests' => sub {

86
t/db_dependent/Koha/SearchEngine/Elasticsearch/QueryBuilder.t

@ -39,50 +39,48 @@ $se->mock( 'get_elasticsearch_mappings', sub {
my %all_mappings;
my $mappings = {
data => {
properties => {
title => {
type => 'text'
},
title__sort => {
type => 'text'
},
subject => {
type => 'text',
facet => 1
},
'subject-heading-thesaurus' => {
type => 'text',
facet => 1
},
itemnumber => {
type => 'integer'
},
sortablenumber => {
type => 'integer'
},
sortablenumber__sort => {
type => 'integer'
},
heading => {
type => 'text'
},
'heading-main' => {
type => 'text'
},
heading__sort => {
type => 'text'
},
match => {
type => 'text'
},
'match-heading' => {
type => 'text'
},
'match-heading-see-from' => {
type => 'text'
},
}
properties => {
title => {
type => 'text'
},
title__sort => {
type => 'text'
},
subject => {
type => 'text',
facet => 1
},
'subject-heading-thesaurus' => {
type => 'text',
facet => 1
},
itemnumber => {
type => 'integer'
},
sortablenumber => {
type => 'integer'
},
sortablenumber__sort => {
type => 'integer'
},
heading => {
type => 'text'
},
'heading-main' => {
type => 'text'
},
heading__sort => {
type => 'text'
},
match => {
type => 'text'
},
'match-heading' => {
type => 'text'
},
'match-heading-see-from' => {
type => 'text'
},
}
};
$all_mappings{$self->index} = $mappings;

38
t/db_dependent/Koha/SearchEngine/Elasticsearch/Search.t

@ -31,26 +31,24 @@ $se->mock( 'get_elasticsearch_mappings', sub {
my %all_mappings;
my $mappings = {
data => {
properties => {
title => {
type => 'text'
},
title__sort => {
type => 'text'
},
subject => {
type => 'text'
},
itemnumber => {
type => 'integer'
},
sortablenumber => {
type => 'integer'
},
sortablenumber__sort => {
type => 'integer'
}
properties => {
title => {
type => 'text'
},
title__sort => {
type => 'text'
},
subject => {
type => 'text'
},
itemnumber => {
type => 'integer'
},
sortablenumber => {
type => 'integer'
},
sortablenumber__sort => {
type => 'integer'
}
}
};

Loading…
Cancel
Save