Tomas Cohen Arazi
d115602c98
This patch makes the 'Locations' facet work as expected (i.e. having the same behaviour it has for Zebra: picking the 952$c in MARC21 and 995e for UNIMARC). It also adds the code to handle holding and home library settings for facets and makes the facets show the library name instead of the branch code. The mappings are updated so the labels match what facets.inc expect to work properly. To test: - On master, do a search that returns biblios with items having homebranch set. => FAIL: Under the 'Locations' label on the facets you will notice branchcodes are shown. - Apply the patch - Restart memcached and plack (just in case, it was tricky) - Reset your mappings: http://localhost:8081/cgi-bin/koha/admin/searchengine/elasticsearch/mappings.pl?op=reset&i_know_what_i_am_doing=1 - Restart memcached and plack (again, not sure if needed) - Make sure this mappings are set: homebranch => HomeLibrary holdingbranch => HoldingLibrary (Note: it might not be set due to the place the yaml file is being picked) - Reindex your records: $ sudo koha-shell kohadev k$ cd kohaclone k$ perl misc/search_tools/rebuild_elastic_search.pl -d -v - Repeat the initial search => SUCCESS: 'Location' contains the right stuff, 'Home libraries' and 'Holding libraries' too. - Run k$ prove t/db_dependent/Koha_SearchEngine_Elasticsearch_Search.t => SUCCESS: Tests pass! - Sign off :-D Note: play with the 'DisplayLibraryFacets' syspref options. Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
106 lines
3.7 KiB
Perl
106 lines
3.7 KiB
Perl
# Copyright 2015 Catalyst IT
|
|
#
|
|
# This file is part of Koha.
|
|
#
|
|
# Koha is free software; you can redistribute it and/or modify it
|
|
# under the terms of the GNU General Public License as published by
|
|
# the Free Software Foundation; either version 3 of the License, or
|
|
# (at your option) any later version.
|
|
#
|
|
# Koha is distributed in the hope that it will be useful, but
|
|
# WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with Koha; if not, see <http://www.gnu.org/licenses>.
|
|
|
|
use Modern::Perl;
|
|
|
|
use Test::More tests => 12;
|
|
use t::lib::Mocks;
|
|
|
|
use Koha::SearchEngine::Elasticsearch::QueryBuilder;
|
|
|
|
my $builder = Koha::SearchEngine::Elasticsearch::QueryBuilder->new( { index => 'mydb' } );
|
|
|
|
use_ok('Koha::SearchEngine::Elasticsearch::Search');
|
|
|
|
ok(
|
|
my $searcher = Koha::SearchEngine::Elasticsearch::Search->new(
|
|
{ 'nodes' => ['localhost:9200'], 'index' => 'mydb' }
|
|
),
|
|
'Creating a Koha::SearchEngine::Elasticsearch::Search object'
|
|
);
|
|
|
|
is( $searcher->index, 'mydb', 'Testing basic accessor' );
|
|
|
|
ok( my $query = $builder->build_query('easy'), 'Build a search query');
|
|
|
|
SKIP: {
|
|
|
|
eval { $builder->get_elasticsearch_params; };
|
|
|
|
skip 'ElasticSeatch configuration not available', 6
|
|
if $@;
|
|
|
|
ok( my $results = $searcher->search( $query) , 'Do a search ' );
|
|
|
|
ok( my $marc = $searcher->json2marc( $results->first ), 'Convert JSON to MARC');
|
|
|
|
is (my $count = $searcher->count( $query ), 0 , 'Get a count of the results, without returning results ');
|
|
|
|
ok ($results = $searcher->search_compat( $query ), 'Test search_compat' );
|
|
|
|
ok (($results,$count) = $searcher->search_auth_compat ( $query ), 'Test search_auth_compat' );
|
|
|
|
is ( $count = $searcher->count_auth_use($searcher,1), 0, 'Testing count_auth_use');
|
|
|
|
}
|
|
|
|
subtest 'json2marc' => sub {
|
|
plan tests => 4;
|
|
my $leader = '00626nam a2200193 4500';
|
|
my $_001 = 42;
|
|
my $_010a = '123456789';
|
|
my $_010d = 145;
|
|
my $_200a = 'a title';
|
|
my $json = [ # It's not a JSON, see the POD of json2marc
|
|
[ 'LDR', undef, undef, '_', $leader ],
|
|
[ '001', undef, undef, '_', $_001 ],
|
|
[ '010', ' ', ' ', 'a', $_010a, 'd', $_010d ],
|
|
[ '200', '1', ' ', 'a', $_200a, ], # Yes UNIMARC but we don't mind here
|
|
];
|
|
|
|
my $marc = $searcher->json2marc( $json );
|
|
is( $marc->leader, $leader, );
|
|
is( $marc->field('001')->data, $_001, );
|
|
is( $marc->subfield('010', 'a'), $_010a, );
|
|
is( $marc->subfield('200', 'a'), $_200a, );
|
|
|
|
};
|
|
|
|
subtest 'build_query tests' => sub {
|
|
plan tests => 6;
|
|
|
|
t::lib::Mocks::mock_preference('DisplayLibraryFacets','both');
|
|
my $query = $builder->build_query();
|
|
ok( defined $query->{aggregations}{homebranch},
|
|
'homebranch added to facets if DisplayLibraryFacets=both' );
|
|
ok( defined $query->{aggregations}{holdingbranch},
|
|
'holdingbranch added to facets if DisplayLibraryFacets=both' );
|
|
t::lib::Mocks::mock_preference('DisplayLibraryFacets','holding');
|
|
$query = $builder->build_query();
|
|
ok( !defined $query->{aggregations}{homebranch},
|
|
'homebranch not added to facets if DisplayLibraryFacets=holding' );
|
|
ok( defined $query->{aggregations}{holdingbranch},
|
|
'holdingbranch added to facets if DisplayLibraryFacets=holding' );
|
|
t::lib::Mocks::mock_preference('DisplayLibraryFacets','home');
|
|
$query = $builder->build_query();
|
|
ok( defined $query->{aggregations}{homebranch},
|
|
'homebranch added to facets if DisplayLibraryFacets=home' );
|
|
ok( !defined $query->{aggregations}{holdingbranch},
|
|
'holdingbranch not added to facets if DisplayLibraryFacets=home' );
|
|
};
|
|
|
|
1;
|