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>
146 lines
4.9 KiB
Perl
Executable file
146 lines
4.9 KiB
Perl
Executable file
#!/usr/bin/perl
|
|
#
|
|
# Copyright 2006 (C) LibLime
|
|
# Joshua Ferraro <jmf@liblime.com>
|
|
#
|
|
# 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 constant WHEREAMI => 't/db_dependent/Record/testrecords';
|
|
|
|
# specify the number of tests
|
|
use Test::More tests => 21; #FIXME Commented out two failing tests
|
|
#use C4::Context;
|
|
use C4::Record qw( marc2marc marc2marcxml marc2dcxml changeEncoding );
|
|
|
|
=head1 NAME
|
|
|
|
Record_test.pl - test suite for Record.pm
|
|
|
|
=head1 SYNOPSIS
|
|
|
|
$ export KOHA_CONF=/path/to/koha.conf
|
|
$ ./Record_test.pl
|
|
|
|
=cut
|
|
|
|
## FIXME: Preliminarily grab the modules dir so we can run this in context
|
|
|
|
ok (1, 'module compiled');
|
|
|
|
# open some files for testing
|
|
open my $MARC21MARC8, '<', WHEREAMI."/marc21_marc8.dat" or die $!;
|
|
my $marc21_marc8; # = scalar (MARC21MARC8);
|
|
foreach my $line (<$MARC21MARC8>) {
|
|
$marc21_marc8 .= $line;
|
|
}
|
|
$marc21_marc8 =~ s/\n$//;
|
|
close $MARC21MARC8;
|
|
|
|
open (my $MARC21UTF8, '<:encoding(UTF-8)', WHEREAMI."/marc21_utf8.dat") or die $!;
|
|
my $marc21_utf8;
|
|
foreach my $line (<$MARC21UTF8>) {
|
|
$marc21_utf8 .= $line;
|
|
}
|
|
$marc21_utf8 =~ s/\n$//;
|
|
close $MARC21UTF8;
|
|
|
|
open(my $MARC21MARC8COMBCHARS, '<', WHEREAMI."/marc21_marc8_combining_chars.dat") or die $!;
|
|
my $marc21_marc8_combining_chars;
|
|
foreach my $line(<$MARC21MARC8COMBCHARS>) {
|
|
$marc21_marc8_combining_chars.=$line;
|
|
}
|
|
$marc21_marc8_combining_chars =~ s/\n$//; #FIXME: why is a newline ending up here?
|
|
close $MARC21MARC8COMBCHARS;
|
|
|
|
open (my $MARC21UTF8COMBCHARS, '<:encoding(UTF-8)', WHEREAMI."/marc21_utf8_combining_chars.dat") or die $!;
|
|
my $marc21_utf8_combining_chars;
|
|
foreach my $line(<$MARC21UTF8COMBCHARS>) {
|
|
$marc21_utf8_combining_chars.=$line;
|
|
}
|
|
close $MARC21UTF8COMBCHARS;
|
|
|
|
open (my $MARCXMLUTF8, '<:encoding(UTF-8)', WHEREAMI."/marcxml_utf8.xml") or die $!;
|
|
my $marcxml_utf8;
|
|
foreach my $line (<$MARCXMLUTF8>) {
|
|
$marcxml_utf8 .= $line;
|
|
}
|
|
close $MARCXMLUTF8;
|
|
|
|
$marcxml_utf8 =~ s/\n//g;
|
|
|
|
## The Tests:
|
|
my $error; my $marc; my $marcxml; # some scalars to store values
|
|
## MARC to MARCXML
|
|
print "\n1. Checking conversion of simple ISO-2709 (MARC21) records to MARCXML\n";
|
|
ok (($error,$marcxml) = marc2marcxml($marc21_marc8,'UTF-8','MARC21'), 'marc2marcxml - from MARC-8 to UTF-8 (MARC21)');
|
|
ok (!$error, 'no errors in conversion');
|
|
#FIXME This test fails
|
|
# $marcxml =~ s/\n//g;
|
|
# $marcxml =~ s/v\/ s/v\/s/g; # FIXME: bug in new_from_xml_record!!
|
|
#is ($marcxml,$marcxml_utf8, 'record matches antitype');
|
|
|
|
ok (($error,$marcxml) = marc2marcxml($marc21_utf8,'UTF-8','MARC21'), 'marc2marcxml - from UTF-8 to UTF-8 (MARC21)');
|
|
ok (!$error, 'no errors in conversion');
|
|
#FIXME This test fails
|
|
# $marcxml =~ s/\n//g;
|
|
# $marcxml =~ s/v\/ s/v\/s/g;
|
|
#is ($marcxml,$marcxml_utf8, 'record matches antitype');
|
|
|
|
print "\n2. checking binary MARC21 records with combining characters to MARCXML\n";
|
|
ok (($error,$marcxml) = marc2marcxml($marc21_marc8_combining_chars,'MARC-8','MARC21'), 'marc2marcxml - from MARC-8 to MARC-8 with combining characters(MARC21)');
|
|
ok (!$error, 'no errors in conversion');
|
|
|
|
ok (($error,$marcxml) = marc2marcxml($marc21_marc8_combining_chars,'UTF-8','MARC21'), 'marc2marcxml - from MARC-8 to UTF-8 with combining characters (MARC21)');
|
|
ok (!$error, 'no errors in conversion');
|
|
|
|
ok (($error,$marcxml) = marc2marcxml($marc21_utf8_combining_chars,'UTF-8','MARC21'), 'marc2marcxml - from UTF-8 to UTF-8 with combining characters (MARC21)');
|
|
ok (!$error, 'no errors in conversion');
|
|
|
|
ok (eval{marc2dcxml($marc21_utf8, undef, undef, 'oaidc')}, 'marc2dcxml - from ISO-2709 to Dublin Core');
|
|
$error = $@;
|
|
ok (!$error, 'no errors in conversion to DublinCore');
|
|
|
|
print "\n3. checking ability to alter encoding\n";
|
|
ok (($error,$marc) = changeEncoding($marc21_marc8,'MARC','MARC21','UTF-8'), 'changeEncoding - MARC21 from MARC-8 to UTF-8');
|
|
ok (!$error, 'no errors in conversion');
|
|
|
|
ok (($error,$marc) = changeEncoding($marc21_utf8,'MARC','MARC21','MARC-8'), 'changeEncoding - MARC21 from UTF-8 to MARC-8');
|
|
ok (!$error, 'no errors in conversion');
|
|
|
|
ok (($error,$marc) = changeEncoding($marc21_marc8,'MARC','MARC21','MARC-8'), 'changeEncoding - MARC21 from MARC-8 to MARC-8');
|
|
ok (!$error, 'no errors in conversion');
|
|
|
|
ok (($error,$marc) = changeEncoding($marc21_utf8,'MARC','MARC21','UTF-8'), 'changeEncoding - MARC21 from UTF-8 to UTF-8');
|
|
ok (!$error, 'no errors in conversion');
|
|
|
|
__END__
|
|
|
|
=head1 TODO
|
|
|
|
Still lots more to test including UNIMARC support
|
|
|
|
=head1 AUTHOR
|
|
|
|
Joshua Ferraro <jmf@liblime.com>
|
|
|
|
=head1 MODIFICATIONS
|
|
|
|
|
|
=cut
|