Nick Clemens
bf7389d601
Bug 30280 added the ability to use multiple thesauri for authorities in Koha. This is a large change, and many libraries use authorities in a ess strict manner. This patch simply adds a preference, disabled by default, to enable this new feature To test: 1 - Find or create a record with a 650 heading, second indicator 0 (LOC) 2 - Ensure this links to an authority in your system 3 - Disable AutoCreateAuthorities, enable CatalogModuleRelink 4 - Edit the heading to second indicator 2 5 - Save, the heading does not link 6 - Apply patch, updatedatabase, restart all 7 - Edit and save record again 8 - Heading should now link to the LOC authority, despite different second indicator value for source Signed-off-by: Phil Ringnalda <phil@chetcolibrary.org> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
197 lines
8.6 KiB
Perl
Executable file
197 lines
8.6 KiB
Perl
Executable file
#!/usr/bin/perl
|
|
#
|
|
# 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 strict;
|
|
use warnings;
|
|
|
|
use Test::More tests => 4;
|
|
|
|
use t::lib::Mocks;
|
|
use Test::MockModule;
|
|
|
|
BEGIN {
|
|
use_ok('C4::Heading', qw( field valid_heading_subfield ));
|
|
}
|
|
|
|
subtest "MARC21 tests" => sub {
|
|
plan tests => 8;
|
|
|
|
t::lib::Mocks::mock_preference('marcflavour', 'MARC21');
|
|
|
|
ok(C4::Heading::valid_heading_subfield('100', 'a'), '100a valid for bib');
|
|
ok(!C4::Heading::valid_heading_subfield('100', 'e'), '100e not valid for bib');
|
|
|
|
ok(C4::Heading::valid_heading_subfield('100', 'a', 1), '100a valid for authority');
|
|
|
|
ok(C4::Heading::valid_heading_subfield('110', 'a'), '110a valid for bib');
|
|
ok(!C4::Heading::valid_heading_subfield('110', 'e'), '110e not valid for bib');
|
|
|
|
ok(C4::Heading::valid_heading_subfield('600', 'a'), '600a valid for bib');
|
|
ok(!C4::Heading::valid_heading_subfield('600', 'e'), '600e not valid for bib');
|
|
|
|
ok(!C4::Heading::valid_heading_subfield('012', 'a'), '012a invalid field for bib');
|
|
};
|
|
|
|
subtest "UNIMARC tests" => sub {
|
|
plan tests => 7;
|
|
|
|
t::lib::Mocks::mock_preference('marcflavour', 'UNIMARC');
|
|
|
|
ok(C4::Heading::valid_heading_subfield('100', 'a'), '100a valid for bib');
|
|
ok(!C4::Heading::valid_heading_subfield('100', 'i'), '100i not valid fir bib');
|
|
|
|
ok(C4::Heading::valid_heading_subfield('110', 'a'), '110a valid for bib');
|
|
ok(!C4::Heading::valid_heading_subfield('110', 'i'), '110i not valid for bib');
|
|
|
|
ok(C4::Heading::valid_heading_subfield('600', 'a'), '600a valid for bib');
|
|
ok(!C4::Heading::valid_heading_subfield('600', 'i'), '600i not valid for bib');
|
|
|
|
ok(!C4::Heading::valid_heading_subfield('012', 'a'), '012a invalid field for bib');
|
|
};
|
|
|
|
subtest "_search tests" => sub {
|
|
|
|
plan tests => 10;
|
|
|
|
t::lib::Mocks::mock_preference('marcflavour', 'MARC21');
|
|
t::lib::Mocks::mock_preference('SearchEngine', 'Elasticsearch');
|
|
# NOTE: We are testing solely against ES here to make the assumptions simpler while testing
|
|
# C4/Headings code specifically. The actual query building and searching code should
|
|
# be covered in other test files
|
|
my $search = Test::MockModule->new('Koha::SearchEngine::Elasticsearch::Search');
|
|
|
|
$search->mock('search_auth_compat', sub {
|
|
my $self = shift;
|
|
my $search_query = shift;
|
|
return ($search_query, 1 );
|
|
});
|
|
|
|
t::lib::Mocks::mock_preference('LinkerConsiderThesaurus', '0');
|
|
|
|
my $field = MARC::Field->new( '650', ' ', '0', a => 'Uncles', x => 'Fiction' );
|
|
my $heading = C4::Heading->new_from_field($field);
|
|
my ($search_query) = $heading->_search( 'match-heading' );
|
|
my $terms = $search_query->{query}->{bool}->{must};
|
|
my $expected_terms = [
|
|
{ term => { 'match-heading.ci_raw' => 'Uncles generalsubdiv Fiction' } },
|
|
];
|
|
is_deeply( $terms, $expected_terms, "Search formed only using heading content, not thesaurus, when LinkerConsiderThesaurus disabled");
|
|
|
|
|
|
t::lib::Mocks::mock_preference('LinkerConsiderThesaurus', '1');
|
|
|
|
$field = MARC::Field->new( '650', ' ', '0', a => 'Uncles', x => 'Fiction' );
|
|
$heading = C4::Heading->new_from_field($field);
|
|
($search_query) = $heading->_search( 'match-heading' );
|
|
$terms = $search_query->{query}->{bool}->{must};
|
|
$expected_terms = [
|
|
{ term => { 'match-heading.ci_raw' => 'Uncles generalsubdiv Fiction' } },
|
|
{ term => { 'subject-heading-thesaurus.ci_raw' => 'a' } },
|
|
];
|
|
is_deeply( $terms, $expected_terms, "Search formed as expected for a subject with second indicator 0");
|
|
|
|
$field = MARC::Field->new( '650', ' ', '3', a => 'Uncles', x => 'Fiction' );
|
|
$heading = C4::Heading->new_from_field($field);
|
|
($search_query) = $heading->_search( 'match-heading' );
|
|
$terms = $search_query->{query}->{bool}->{must};
|
|
$expected_terms = [
|
|
{ term => { 'match-heading.ci_raw' => 'Uncles generalsubdiv Fiction' } },
|
|
{ term => { 'subject-heading-thesaurus.ci_raw' => 'd' } },
|
|
];
|
|
is_deeply( $terms, $expected_terms, "Search formed as expected with second indicator 3");
|
|
|
|
$field = MARC::Field->new( '650', ' ', '7', a => 'Uncles', x => 'Fiction', 2 => 'special_sauce' );
|
|
$heading = C4::Heading->new_from_field($field);
|
|
($search_query) = $heading->_search( 'match-heading' );
|
|
$terms = $search_query->{query}->{bool}->{must};
|
|
$expected_terms = [
|
|
{ term => { 'match-heading.ci_raw' => 'Uncles generalsubdiv Fiction' } },
|
|
{ term => { 'subject-heading-thesaurus.ci_raw' => 'special_sauce' } },
|
|
];
|
|
is_deeply( $terms, $expected_terms, "Search formed as expected with second indicator 7 and subfield 2");
|
|
|
|
$field = MARC::Field->new( '650', ' ', '4', a => 'Uncles', x => 'Fiction' );
|
|
$heading = C4::Heading->new_from_field($field);
|
|
($search_query) = $heading->_search( 'match-heading' );
|
|
$terms = $search_query->{query}->{bool}->{must};
|
|
$expected_terms = [
|
|
{ term => { 'match-heading.ci_raw' => 'Uncles generalsubdiv Fiction' } },
|
|
{ term => { 'subject-heading-thesaurus.ci_raw' => '|' } },
|
|
];
|
|
is_deeply( $terms, $expected_terms, "Search looks for thesaurus '|' when second indicator 4");
|
|
|
|
$field = MARC::Field->new( '100', ' ', '', a => 'Yankovic, Al', d => '1959-,' );
|
|
$heading = C4::Heading->new_from_field($field);
|
|
($search_query) = $heading->_search( 'match-heading' );
|
|
$terms = $search_query->{query}->{bool}->{must};
|
|
$expected_terms = [
|
|
{ term => { 'match-heading.ci_raw' => 'Yankovic, Al 1959' } },
|
|
];
|
|
is_deeply( $terms, $expected_terms, "Search formed as expected for a non-subject field with single punctuation mark");
|
|
|
|
$field = MARC::Field->new( '100', ' ', '', a => 'Yankovic, Al', d => '1959-,', e => '[author]' );
|
|
$heading = C4::Heading->new_from_field($field);
|
|
($search_query) = $heading->_search( 'match-heading' );
|
|
$terms = $search_query->{query}->{bool}->{must};
|
|
$expected_terms = [
|
|
{ term => { 'match-heading.ci_raw' => 'Yankovic, Al 1959' } },
|
|
];
|
|
is_deeply( $terms, $expected_terms, "Search formed as expected for a non-subject field with double punctuation, hyphen+comma");
|
|
|
|
$field = MARC::Field->new( '100', ' ', '', a => 'Tolkien, J.R.R.,', e => '[author]' );
|
|
$heading = C4::Heading->new_from_field($field);
|
|
($search_query) = $heading->_search( 'match-heading' );
|
|
$terms = $search_query->{query}->{bool}->{must};
|
|
$expected_terms = [
|
|
{ term => { 'match-heading.ci_raw' => 'Tolkien, J.R.R' } },
|
|
];
|
|
is_deeply( $terms, $expected_terms, "Search formed as expected for a non-subject field with double punctuation, period+comma ");
|
|
|
|
$search->mock('search_auth_compat', sub {
|
|
my $self = shift;
|
|
my $search_query = shift;
|
|
if(
|
|
scalar @{$search_query->{query}->{bool}->{must}} == 2 &&
|
|
$search_query->{query}->{bool}->{must}[1]->{term}->{'subject-heading-thesaurus.ci_raw'} eq 'special_sauce'
|
|
){
|
|
return;
|
|
}
|
|
return ($search_query, 1);
|
|
});
|
|
|
|
# Special case where thesaurus defined in subfield 2 should also match record with no thesaurus
|
|
$field = MARC::Field->new( '650', ' ', '7', a => 'Uncles', x => 'Fiction', 2 => 'special_sauce' );
|
|
$heading = C4::Heading->new_from_field($field);
|
|
($search_query) = $heading->_search( 'match-heading' );
|
|
$terms = $search_query->{query}->{bool}->{must};
|
|
$expected_terms = [
|
|
{ term => { 'match-heading.ci_raw' => 'Uncles generalsubdiv Fiction' } },
|
|
{ term => { 'subject-heading-thesaurus.ci_raw' => 'z' } },
|
|
];
|
|
is_deeply( $terms, $expected_terms, "When thesaurus in subfield 2, and nothing is found, we should search again for notdefined (008_11 = z) ");
|
|
|
|
t::lib::Mocks::mock_preference('LinkerConsiderThesaurus', '0');
|
|
|
|
$search_query = undef;
|
|
($search_query) = $heading->_search( 'match-heading' );
|
|
$terms = $search_query->{query}->{bool}->{must};
|
|
$expected_terms = [
|
|
{ term => { 'match-heading.ci_raw' => 'Uncles generalsubdiv Fiction' } },
|
|
];
|
|
is_deeply( $terms, $expected_terms, "When thesaurus in subfield 2, and nothing is found, we don't search again if LinkerConsiderThesaurusDisabled");
|
|
|
|
};
|