Jonathan Druart
9d6d641d1f
On bug 17591 we discovered that there was something weird going on with the way we export and use subroutines/modules. This patch tries to standardize our EXPORT to use EXPORT_OK only. That way we will need to explicitely define the subroutine we want to use from a module. This patch is a squashed version of: Bug 17600: After export.pl Bug 17600: After perlimport Bug 17600: Manual changes Bug 17600: Other manual changes after second perlimports run Bug 17600: Fix tests And a lot of other manual changes. export.pl is a dirty script that can be found on bug 17600. "perlimport" is: git clone https://github.com/oalders/App-perlimports.git cd App-perlimports/ cpanm --installdeps . export PERL5LIB="$PERL5LIB:/kohadevbox/koha/App-perlimports/lib" find . \( -name "*.pl" -o -name "*.pm" \) -exec perl App-perlimports/script/perlimports --inplace-edit --no-preserve-unused --filename {} \; The ideas of this patch are to: * use EXPORT_OK instead of EXPORT * perltidy the EXPORT_OK list * remove '&' before the subroutine names * remove some uneeded use statements * explicitely import the subroutines we need within the controllers or modules Note that the private subroutines (starting with _) should not be exported (and not used from outside of the module except from tests). EXPORT vs EXPORT_OK (from https://www.thegeekstuff.com/2010/06/perl-exporter-examples/) """ Export allows to export the functions and variables of modules to user’s namespace using the standard import method. This way, we don’t need to create the objects for the modules to access it’s members. @EXPORT and @EXPORT_OK are the two main variables used during export operation. @EXPORT contains list of symbols (subroutines and variables) of the module to be exported into the caller namespace. @EXPORT_OK does export of symbols on demand basis. """ If this patch caused a conflict with a patch you wrote prior to its push: * Make sure you are not reintroducing a "use" statement that has been removed * "$subroutine" is not exported by the C4::$MODULE module means that you need to add the subroutine to the @EXPORT_OK list * Bareword "$subroutine" not allowed while "strict subs" means that you didn't imported the subroutine from the module: - use $MODULE qw( $subroutine list ); You can also use the fully qualified namespace: C4::$MODULE::$subroutine Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
141 lines
7.1 KiB
Perl
Executable file
141 lines
7.1 KiB
Perl
Executable file
#!/usr/bin/perl
|
|
|
|
# Tests for C4::Biblio::TransformMarcToKoha, TransformMarcToKohaOneField
|
|
|
|
# Copyright 2017 Rijksmuseum
|
|
#
|
|
# 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 => 4;
|
|
use MARC::Record;
|
|
|
|
use t::lib::Mocks;
|
|
use t::lib::TestBuilder;
|
|
|
|
use Koha::Database;
|
|
use Koha::Caches;
|
|
use Koha::MarcSubfieldStructures;
|
|
use C4::Biblio qw( TransformMarcToKoha TransformMarcToKohaOneField );
|
|
|
|
my $schema = Koha::Database->new->schema;
|
|
$schema->storage->txn_begin;
|
|
|
|
# Create a few mappings
|
|
# Note: TransformMarcToKoha wants a table name (biblio, biblioitems or items)
|
|
Koha::MarcSubfieldStructures->search({ frameworkcode => '', tagfield => [ '300', '500' ] })->delete;
|
|
Koha::MarcSubfieldStructure->new({ frameworkcode => '', tagfield => '300', tagsubfield => 'a', kohafield => 'biblio.field1' })->store;
|
|
Koha::MarcSubfieldStructure->new({ frameworkcode => '', tagfield => '300', tagsubfield => 'b', kohafield => 'biblio.field2' })->store;
|
|
Koha::MarcSubfieldStructure->new({ frameworkcode => '', tagfield => '500', tagsubfield => 'a', kohafield => 'biblio.field3' })->store;
|
|
Koha::Caches->get_instance->clear_from_cache( "MarcSubfieldStructure-" );
|
|
|
|
subtest 'Test a few mappings' => sub {
|
|
plan tests => 7;
|
|
|
|
my $marc = MARC::Record->new;
|
|
$marc->append_fields(
|
|
MARC::Field->new( '300', '', '', a => 'a1', b => 'b1' ),
|
|
MARC::Field->new( '300', '', '', a => 'a2', b => 'b2' ),
|
|
MARC::Field->new( '500', '', '', a => 'note1', a => 'note2' ),
|
|
);
|
|
my $result = C4::Biblio::TransformMarcToKoha( $marc );
|
|
# Note: TransformMarcToKoha stripped the table prefix biblio.
|
|
is( keys %{$result}, 3, 'Found all three mappings' );
|
|
is( $result->{field1}, 'a1 | a2', 'Check field1 results' );
|
|
is( $result->{field2}, 'b1 | b2', 'Check field2 results' );
|
|
is( $result->{field3}, 'note1 | note2', 'Check field3 results' );
|
|
|
|
is( C4::Biblio::TransformMarcToKohaOneField( 'biblio.field1', $marc ),
|
|
$result->{field1}, 'TransformMarcToKohaOneField returns biblio.field1');
|
|
is( C4::Biblio::TransformMarcToKohaOneField( 'field4', $marc ),
|
|
undef, 'TransformMarcToKohaOneField returns undef' );
|
|
|
|
# Bug 19096 Default is authoritative now
|
|
# Test passing another framework
|
|
# CAUTION: This parameter of TransformMarcToKoha will be removed later
|
|
my $new_fw = t::lib::TestBuilder->new->build({source => 'BiblioFramework'});
|
|
$result = C4::Biblio::TransformMarcToKoha($marc, $new_fw->{frameworkcode});
|
|
is( keys %{$result}, 3, 'Still found all three mappings' );
|
|
};
|
|
|
|
subtest 'Multiple mappings for one kohafield' => sub {
|
|
plan tests => 4;
|
|
|
|
# Add another mapping to field1
|
|
Koha::MarcSubfieldStructures->search({ frameworkcode => '', tagfield => '510' })->delete;
|
|
Koha::MarcSubfieldStructure->new({ frameworkcode => '', tagfield => '510', tagsubfield => 'a', kohafield => 'biblio.field1' })->store;
|
|
Koha::Caches->get_instance->clear_from_cache( "MarcSubfieldStructure-" );
|
|
|
|
my $marc = MARC::Record->new;
|
|
$marc->append_fields( MARC::Field->new( '300', '', '', a => '3a' ) );
|
|
my $result = C4::Biblio::TransformMarcToKoha( $marc );
|
|
is_deeply( $result, { field1 => '3a' }, 'Simple start' );
|
|
$marc->append_fields( MARC::Field->new( '510', '', '', a => '' ) );
|
|
$result = C4::Biblio::TransformMarcToKoha( $marc );
|
|
is_deeply( $result, { field1 => '3a' }, 'An empty 510a makes no difference' );
|
|
$marc->append_fields( MARC::Field->new( '510', '', '', a => '51' ) );
|
|
$result = C4::Biblio::TransformMarcToKoha( $marc );
|
|
is_deeply( $result, { field1 => '3a | 51' }, 'Got 300a and 510a' );
|
|
|
|
is( C4::Biblio::TransformMarcToKohaOneField( 'biblio.field1', $marc ),
|
|
'3a | 51', 'TransformMarcToKohaOneField returns biblio.field1' );
|
|
};
|
|
|
|
subtest 'Testing _adjust_pubyear' => sub {
|
|
plan tests => 12;
|
|
|
|
is( C4::Biblio::_adjust_pubyear('2004 c2000 2007'), 2000, 'First cYEAR' );
|
|
is( C4::Biblio::_adjust_pubyear('2004 2000 2007'), 2004, 'First year' );
|
|
is( C4::Biblio::_adjust_pubyear('18xx 1900'), 1900, '1900 has priority over 18xx' );
|
|
is( C4::Biblio::_adjust_pubyear('18xx'), 1800, '18xx on its own' );
|
|
is( C4::Biblio::_adjust_pubyear('197X'), 1970, '197X on its own' );
|
|
is( C4::Biblio::_adjust_pubyear('1...'), 1000, '1... on its own' );
|
|
is( C4::Biblio::_adjust_pubyear('12?? 13xx'), 1200, '12?? first' );
|
|
is( C4::Biblio::_adjust_pubyear('12? 1x'), undef, 'Too short return nothing as data must be int' );
|
|
is( C4::Biblio::_adjust_pubyear('198-'), undef, 'Missing question mark, nothing is returned as data must be int' );
|
|
is( C4::Biblio::_adjust_pubyear('198-?'), '1980', '198-?' );
|
|
is( C4::Biblio::_adjust_pubyear('1981-'), '1981', 'Date range returns first date' );
|
|
is( C4::Biblio::_adjust_pubyear('broken'), undef, 'Non-matchign data returns nothing as the field must be int' );
|
|
};
|
|
|
|
subtest 'Test repeatable subfields' => sub {
|
|
plan tests => 5;
|
|
|
|
# Make 510x repeatable and 510y not
|
|
Koha::MarcSubfieldStructures->search({ frameworkcode => '', tagfield => '510' })->delete;
|
|
Koha::MarcSubfieldStructure->new({ frameworkcode => '', tagfield => '510', tagsubfield => 'x', kohafield => 'items.test', repeatable => 1 })->store;
|
|
Koha::MarcSubfieldStructure->new({ frameworkcode => '', tagfield => '510', tagsubfield => 'y', kohafield => 'items.norepeat', repeatable => 0 })->store;
|
|
Koha::Caches->get_instance->clear_from_cache( "MarcSubfieldStructure-" );
|
|
|
|
|
|
my $marc = MARC::Record->new;
|
|
$marc->append_fields( MARC::Field->new( '510', '', '', x => '1', x => '2', y => '3 | 4', y => '5' ) ); # actually, we should only have one $y (BZ 24652)
|
|
my $result = C4::Biblio::TransformMarcToKoha( $marc );
|
|
is( $result->{test}, '1 | 2', 'Check 510x for two values' );
|
|
is( $result->{norepeat}, '3 | 4 | 5', 'Check 510y too' );
|
|
|
|
Koha::MarcSubfieldStructure->new({ frameworkcode => '', tagfield => '510', tagsubfield => 'a', kohafield => 'biblio.field1' })->store;
|
|
Koha::Caches->get_instance->clear_from_cache( "MarcSubfieldStructure-" );
|
|
$marc->append_fields( MARC::Field->new( '510', '', '', a => '1' ) ); # actually, we should only have one $y (BZ 24652)
|
|
|
|
$result = C4::Biblio::TransformMarcToKoha( $marc, '', 'no_items' );
|
|
is( $result->{test}, undef, 'Item field not returned when "no_items" passed' );
|
|
is( $result->{norepeat}, undef, 'Item field not returned when "no_items" passed' );
|
|
is( $result->{field1}, 1, 'Biblio field returned when "no_items" passed' );
|
|
};
|
|
|
|
# Cleanup
|
|
Koha::Caches->get_instance->clear_from_cache( "MarcSubfieldStructure-" );
|
|
$schema->storage->txn_rollback;
|