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>
97 lines
2.6 KiB
Perl
Executable file
97 lines
2.6 KiB
Perl
Executable file
#!/usr/bin/perl
|
|
# load records that already have biblionumber set into a koha system
|
|
# Written by TG on 10/04/2006
|
|
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( GetMarcFromKohaField );
|
|
use MARC::File::USMARC;
|
|
use MARC::File::XML;
|
|
use MARC::Batch;
|
|
use Time::HiRes qw( gettimeofday );
|
|
use Getopt::Long qw( GetOptions );
|
|
use IO::File;
|
|
|
|
my $input_marc_file = '';
|
|
my ($version);
|
|
GetOptions(
|
|
'file:s' => \$input_marc_file,
|
|
'h' => \$version,
|
|
);
|
|
|
|
if ($version || ($input_marc_file eq '')) {
|
|
print <<EOF
|
|
If your ISO2709 file already has biblionumbers, you can use this script
|
|
to import the MARC into your database.
|
|
parameters :
|
|
\th : this version/help screen
|
|
\tfile /path/to/file/to/dump : the file to dump
|
|
SAMPLE :
|
|
\t\$ export KOHA_CONF=/etc/koha.conf
|
|
\t\$ perl misc/marcimport_to_biblioitems.pl -file /home/jmf/koha.mrc
|
|
EOF
|
|
;#'
|
|
die;
|
|
}
|
|
my $starttime = gettimeofday;
|
|
my $timeneeded;
|
|
my $dbh = C4::Context->dbh;
|
|
|
|
my $sth2=$dbh->prepare("update biblioitems set marc=? where biblionumber=?");
|
|
my $fh = IO::File->new($input_marc_file); # don't let MARC::Batch open the file, as it applies the ':utf8' IO layer
|
|
my $batch = MARC::Batch->new( 'USMARC', $fh );
|
|
$batch->warnings_off();
|
|
$batch->strict_off();
|
|
my ($tagfield,$biblionumtagsubfield) = &GetMarcFromKohaField( "biblio.biblionumber" );
|
|
|
|
my $i=0;
|
|
while ( my $record = $batch->next() ) {
|
|
my $biblionumber = ($tagfield < 10) ? $record->field($tagfield)->data : $record->subfield($tagfield, $biblionumtagsubfield);
|
|
$i++;
|
|
$sth2->execute($record->as_usmarc,$biblionumber) if $biblionumber;
|
|
print "$biblionumber \n";
|
|
}
|
|
|
|
$timeneeded = gettimeofday - $starttime ;
|
|
print "$i records in $timeneeded s\n" ;
|
|
|
|
END;
|
|
# IS THIS SUPPOSED TO BE __END__ ?? If not, then what is it? --JBA
|
|
|
|
sub search {
|
|
my ($query)=@_;
|
|
my $nquery="\ \@attr 1=1007 ".$query;
|
|
my $oAuth=C4::Context->Zconn("biblioserver");
|
|
if ($oAuth eq "error"){
|
|
warn "Error/CONNECTING \n";
|
|
return("error",undef);
|
|
}
|
|
my $oAResult;
|
|
my $Anewq= ZOOM::Query::PQF->new($nquery);
|
|
eval {
|
|
$oAResult= $oAuth->search_pqf($nquery) ;
|
|
};
|
|
if($@){
|
|
warn " /Cannot search:", $@->code()," /MSG:",$@->message(),"\n";
|
|
return("error",undef);
|
|
}
|
|
my $authrecord;
|
|
my $nbresults="0";
|
|
$nbresults=$oAResult->size();
|
|
if ($nbresults eq "1" ){
|
|
my $rec=$oAResult->record(0);
|
|
my $marcdata=$rec->raw();
|
|
$authrecord = MARC::File::USMARC::decode($marcdata);
|
|
}
|
|
return ($authrecord,$nbresults);
|
|
}
|