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

Bug 17372: Standardize Elasticsearch paths 

What we currently have:
Koha/ElasticSearch.pm
Koha/ElasticSearch/Indexer.pm
Koha/SearchEngine/Elasticsearch/QueryBuilder.pm
Koha/SearchEngine/Elasticsearch/Search.pm

What we want:
Koha/SearchEngine/Elasticsearch.pm
Koha/SearchEngine/Elasticsearch/Indexer.pm
Koha/SearchEngine/Elasticsearch/QueryBuilder.pm
Koha/SearchEngine/Elasticsearch/Search.pm

Test plan:
  % git grep -i Koha::ElasticSearch
  % git grep ElasticSearch|grep -v Catmandu::Store::ElasticSearch
should not return any result

Do a full reindex and search for records

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>

Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>
This commit is contained in:
Jonathan Druart 2016-09-29 10:31:11 +01:00 committed by Brendan Gallagher
parent a36b643019
commit df3df9cf71
12 changed files with 29 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
C4/Biblio.pm
View File

@ -2974,8 +2974,8 @@ sub ModZebra {
if ( C4::Context->preference('SearchEngine') eq 'Elasticsearch' ) {
# TODO abstract to a standard API that'll work for whatever
require Koha::ElasticSearch::Indexer;
my $indexer = Koha::ElasticSearch::Indexer->new(
require Koha::SearchEngine::Elasticsearch::Indexer;
my $indexer = Koha::SearchEngine::Elasticsearch::Indexer->new(
{
index => $server eq 'biblioserver'
? $Koha::SearchEngine::BIBLIOS_INDEX

6
Koha/ElasticSearch.pm → Koha/SearchEngine/Elasticsearch.pm
View File

@ -1,4 +1,4 @@
package Koha::ElasticSearch;
package Koha::SearchEngine::Elasticsearch;
# Copyright 2015 Catalyst IT
#
@ -42,7 +42,7 @@ Readonly our $AUTHORITIES_INDEX => 'authorities';
=head1 NAME
Koha::ElasticSearch - Base module for things using elasticsearch
Koha::SearchEngine::Elasticsearch - Base module for things using elasticsearch
=head1 ACCESSORS
@ -466,6 +466,8 @@ __END__
=item Robin Sheat C<< <robin@catalyst.net.nz> >>
=item Jonathan Druart C<< <jonathan.druart@bugs.koha-community.org> >>
=back
=cut

10
Koha/ElasticSearch/Indexer.pm → Koha/SearchEngine/Elasticsearch/Indexer.pm
View File

@ -1,4 +1,4 @@
package Koha::ElasticSearch::Indexer;
package Koha::SearchEngine::Elasticsearch::Indexer;
# Copyright 2013 Catalyst IT
#
@ -19,22 +19,22 @@ package Koha::ElasticSearch::Indexer;
use Carp;
use Modern::Perl;
use base qw(Koha::ElasticSearch);
use base qw(Koha::SearchEngine::Elasticsearch);
use Data::Dumper;
# For now just marc, but we can do anything here really
use Catmandu::Importer::MARC;
use Catmandu::Store::ElasticSearch;
Koha::ElasticSearch::Indexer->mk_accessors(qw( store ));
Koha::SearchEngine::Elasticsearch::Indexer->mk_accessors(qw( store ));
=head1 NAME
Koha::ElasticSearch::Indexer - handles adding new records to the index
Koha::SearchEngine::Elasticsearch::Indexer - handles adding new records to the index
=head1 SYNOPSIS
my $indexer = Koha::ElasticSearch::Indexer->new(
my $indexer = Koha::SearchEngine::Elasticsearch::Indexer->new(
{ index => Koha::SearchEngine::BIBLIOS_INDEX } );
$indexer->drop_index();
$indexer->update_index(\@biblionumbers, \@records);

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

@ -39,7 +39,7 @@ provides something that can be given to elasticsearch to get answers.
=cut
use base qw(Koha::ElasticSearch);
use base qw(Koha::SearchEngine::Elasticsearch);
use Carp;
use JSON;
use List::MoreUtils qw/ each_array /;
@ -143,7 +143,7 @@ sub build_browse_query {
return { query => '*' } if !defined $query;
# TODO this should come from Koha::Elasticsearch
# TODO this should come from Koha::SearchEngine::Elasticsearch
my %field_whitelist = (
title => 1,
author => 1,

6
Koha/SearchEngine/Elasticsearch/Search.pm
View File

@ -19,12 +19,12 @@ package Koha::SearchEngine::Elasticsearch::Search;
=head1 NAME
Koha::SearchEngine::ElasticSearch::Search - search functions for Elasticsearch
Koha::SearchEngine::Elasticsearch::Search - search functions for Elasticsearch
=head1 SYNOPSIS
my $searcher =
Koha::SearchEngine::ElasticSearch::Search->new( { index => $index } );
Koha::SearchEngine::Elasticsearch::Search->new( { index => $index } );
my $builder = Koha::SearchEngine::Elasticsearch::QueryBuilder->new(
{ index => $index } );
my $query = $builder->build_query('perl');
@ -40,7 +40,7 @@ Koha::SearchEngine::ElasticSearch::Search - search functions for Elasticsearch
use Modern::Perl;
use base qw(Koha::ElasticSearch);
use base qw(Koha::SearchEngine::Elasticsearch);
use C4::Context;
use Koha::ItemTypes;
use Koha::AuthorisedValues;

4
installer/data/mysql/updatedatabase.pl
View File

@ -12276,7 +12276,7 @@ $DBversion = "3.23.00.050";
if ( CheckVersion($DBversion) ) {
use Koha::SearchMarcMaps;
use Koha::SearchFields;
use Koha::ElasticSearch;
use Koha::SearchEngine::Elasticsearch;
$dbh->do(q|INSERT IGNORE INTO systempreferences (variable,value,explanation,options,type)
VALUES('SearchEngine','Zebra','Choose Search Engine','','Choice')|);
@ -12339,7 +12339,7 @@ $dbh->do(q|
|);
# Insert default mappings
Koha::ElasticSearch->reset_elasticsearch_mappings;
Koha::SearchEngine::Elasticsearch->reset_elasticsearch_mappings;
print "Upgrade to $DBversion done (Bug 12478 - Elasticsearch support for Koha)\n";
SetVersion($DBversion);

4
installer/install.pl
View File

@ -209,8 +209,8 @@ elsif ( $step && $step == 3 ) {
"fwklanguage" => $fwk_language,
"list" => $list
);
use Koha::ElasticSearch;
Koha::ElasticSearch->reset_elasticsearch_mappings;
use Koha::SearchEngine::Elasticsearch;
Koha::SearchEngine::Elasticsearch->reset_elasticsearch_mappings;
$template->param( "$op" => 1 );
}
elsif ( $op && $op eq 'selectframeworks' ) {

8
misc/search_tools/rebuild_elastic_search.pl
View File

@ -86,7 +86,7 @@ use Getopt::Long;
use C4::Context;
use Koha::MetadataRecord::Authority;
use Koha::BiblioUtils;
use Koha::ElasticSearch::Indexer;
use Koha::SearchEngine::Elasticsearch::Indexer;
use MARC::Field;
use MARC::Record;
use Modern::Perl;
@ -136,7 +136,7 @@ if ($index_biblios) {
$records->next();
}
}
do_reindex($next, $Koha::ElasticSearch::BIBLIOS_INDEX);
do_reindex($next, $Koha::SearchEngine::Elasticsearch::BIBLIOS_INDEX);
}
if ($index_authorities) {
_log(1, "Indexing authorities\n");
@ -153,13 +153,13 @@ if ($index_authorities) {
$records->next();
}
}
do_reindex($next, $Koha::ElasticSearch::AUTHORITIES_INDEX);
do_reindex($next, $Koha::SearchEngine::Elasticsearch::AUTHORITIES_INDEX);
}
sub do_reindex {
my ( $next, $index_name ) = @_;
my $indexer = Koha::ElasticSearch::Indexer->new( { index => $index_name } );
my $indexer = Koha::SearchEngine::Elasticsearch::Indexer->new( { index => $index_name } );
if ($delete) {
# We know it's safe to not recreate the indexer because update_index

2
t/00-load.t
View File

@ -82,7 +82,7 @@ sub is_testable {
@needed_module_names =
( 'SOAP::Lite', 'Crypt::GCrypt', 'Digest::SHA', 'Convert::BaseN' );
}
elsif ( $module_name =~ /Koha::ElasticSearch::Indexer/xsm ) {
elsif ( $module_name =~ /Koha::SearchEngine::Elasticsearch::Indexer/xsm ) {
@needed_module_names =
( 'Catmandu::Importer::MARC', 'Catmandu::Store::ElasticSearch' );
}

2
t/db_dependent/Koha_ElasticSearch.t → t/db_dependent/Koha_Elasticsearch.
View File

@ -20,4 +20,4 @@ use warnings;
use Test::More tests => 1; # last test to print
use_ok('Koha::ElasticSearch');
use_ok('Koha::Search::Engine::Elasticsearch');

4
t/db_dependent/Koha_ElasticSearch_Indexer.t → t/db_dependent/Koha_Elasticsearch_Indexer.t
View File

@ -21,11 +21,11 @@ use Test::More tests => 5;
use MARC::Record;
use_ok('Koha::ElasticSearch::Indexer');
use_ok('Koha::SearchEngine::Elasticsearch::Indexer');
my $indexer;
ok(
$indexer = Koha::ElasticSearch::Indexer->new({ 'index' => 'biblio' }),
$indexer = Koha::SearchEngine::Elasticsearch::Indexer->new({ 'index' => 'biblio' }),
'Creating new indexer object'
);

2
t/db_dependent/Koha_SearchEngine_Elasticsearch_Search.t
View File

@ -29,7 +29,7 @@ ok(
my $searcher = Koha::SearchEngine::Elasticsearch::Search->new(
{ 'nodes' => ['localhost:9200'], 'index' => 'mydb' }
),
'Creating a Koha::ElasticSearch::Search object'
'Creating a Koha::SearchEngine::Elasticsearch::Search object'
);
is( $searcher->index, 'mydb', 'Testing basic accessor' );