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>
72 lines
2.5 KiB
Perl
Executable file
72 lines
2.5 KiB
Perl
Executable file
#!/usr/bin/perl
|
|
# small script that rebuilds the non-MARC DB
|
|
|
|
use strict;
|
|
#use warnings; FIXME - Bug 2505
|
|
BEGIN {
|
|
# find Koha's Perl modules
|
|
# test carefully before changing this
|
|
use FindBin ();
|
|
eval { require "$FindBin::Bin/kohalib.pl" };
|
|
}
|
|
|
|
# Koha modules used
|
|
use Koha::Script;
|
|
use C4::Context;
|
|
use C4::Biblio qw( GetMarcStructure );
|
|
use Time::HiRes qw( gettimeofday );
|
|
|
|
use Getopt::Long qw( GetOptions );
|
|
my ( $input_marc_file, $number) = ('',0);
|
|
my ($version, $confirm,$test_parameter);
|
|
GetOptions(
|
|
'c' => \$confirm,
|
|
'h' => \$version,
|
|
't' => \$test_parameter,
|
|
);
|
|
|
|
if ($version || (!$confirm)) {
|
|
print <<EOF
|
|
This script cleans unused subfields in the MARC DB.
|
|
If you alter the MARC parameters and remove a subfield (ie : move it to ignore (10) tab), existing subfields are NOT removed.
|
|
It's not a bug, it prevents deleting useful values in case of erroneous move.
|
|
This script definitely remove unused subfields in the MARC DB.
|
|
syntax :
|
|
\t./cleanmarcdb.pl -h (or without arguments => shows this screen)
|
|
\t./cleanmarcdb.pl -c (c like confirm => cleans the marc DB (may be long)
|
|
\t-t => test only, change nothing in DB
|
|
EOF
|
|
;#'
|
|
die;
|
|
}
|
|
|
|
my $dbh = C4::Context->dbh;
|
|
my $i=0;
|
|
my $starttime = gettimeofday;
|
|
my $cleansubfield = $dbh->prepare("delete from marc_subfield_table where tag=? and subfieldcode=?");
|
|
my $cleanword = $dbh->prepare("delete from marc_word where tag=? and subfieldid=?");
|
|
|
|
# get tags structure
|
|
my $tags = GetMarcStructure(1);
|
|
foreach my $tag (sort keys(%{$tags})) {
|
|
foreach my $subfield (sort keys(%{$tags->{$tag}})) {
|
|
next if $subfield eq "lib";
|
|
next if $subfield eq "mandatory";
|
|
next if $subfield eq "tab";
|
|
# DO NOT drop biblionumber, biblioitemnumber and itemnumber.
|
|
# they are stored internally, and are mapped to tab -1. This script must keep them or it will completly break Koha DB !!!
|
|
next if ($tags->{$tag}->{$subfield}->{kohafield} eq "biblio.biblionumber");
|
|
next if ($tags->{$tag}->{$subfield}->{kohafield} eq "biblioitems.biblioitemnumber");
|
|
next if ($tags->{$tag}->{$subfield}->{kohafield} eq "items.itemnumber");
|
|
# now, test => if field is ignored (in tab -1 or '') => drop everything in the MARC table !
|
|
if ($tags->{$tag}->{$subfield}->{tab} eq -1 || $tags->{$tag}->{$subfield}->{tab} eq '') {
|
|
print "dropping $tag \$ $subfield\n";
|
|
$cleansubfield->execute($tag,$subfield) unless $test_parameter;
|
|
$cleanword->execute($tag,$subfield) unless $test_parameter;
|
|
print "TEST " if $test_parameter;
|
|
print "done\n";
|
|
}
|
|
}
|
|
}
|
|
my $timeneeded = gettimeofday - $starttime;
|
|
print "done in $timeneeded seconds\n";
|