BEGIN {
# find Koha's Perl modules
# test carefully before changing this
- use FindBin;
+ use FindBin ();
eval { require "$FindBin::Bin/../kohalib.pl" };
}
# Koha modules used
use MARC::File::USMARC;
use MARC::File::XML;
-use MARC::Record;
use MARC::Batch;
-use MARC::Charset;
+use Encode;
use Koha::Script;
use C4::Context;
-use C4::Biblio;
+use C4::Biblio qw(
+ AddBiblio
+ GetMarcFromKohaField
+ ModBiblio
+ ModBiblioMarc
+);
use C4::Koha;
-use C4::Debug;
-use C4::Charset;
-use C4::Items;
-use C4::MarcModificationTemplates;
-
-use YAML;
-use Unicode::Normalize;
-use Time::HiRes qw(gettimeofday);
-use Getopt::Long;
+use C4::Charset qw( MarcToUTF8Record SetUTF8Flag );
+use C4::Items qw( AddItemBatchFromMarc );
+use C4::MarcModificationTemplates qw(
+ GetModificationTemplates
+ ModifyRecordWithTemplate
+);
+
+use YAML::XS;
+use Time::HiRes qw( gettimeofday );
+use Getopt::Long qw( GetOptions );
use IO::File;
-use Pod::Usage;
+use Pod::Usage qw( pod2usage );
+use Koha::Logger;
use Koha::Biblios;
use Koha::SearchEngine;
use Koha::SearchEngine::Search;
if($marc_mod_template_id < 0) {
die "Can't located MARC modification template '$marc_mod_template'\n";
} else {
- print "Records will be modified using MARC modofication template: $marc_mod_template\n" if $verbose;
+ print "Records will be modified using MARC modification template: $marc_mod_template\n" if $verbose;
}
}
my $dbh = C4::Context->dbh;
my $heading_fields=get_heading_fields();
+my $idmapfh;
if (defined $idmapfl) {
- open(IDMAP,">$idmapfl") or die "cannot open $idmapfl \n";
+ open($idmapfh, '>', $idmapfl) or die "cannot open $idmapfl \n";
}
if ((not defined $sourcesubfield) && (not defined $sourcetag)){
# Disable logging for the biblios and authorities import operation. It would unnecessarily
# slow the import
-
-# Disable the syspref cache so we can change logging settings
-C4::Context->disable_syspref_cache();
-# Save current CataloguingLog and AuthoritiesLog sysprefs values
-my $CataloguingLog = C4::Context->preference( 'CataloguingLog' );
-my $AuthoritiesLog = C4::Context->preference( 'AuthoritiesLog' );
-# Disable logging for both
-C4::Context->set_preference( 'CataloguingLog', 0 );
-C4::Context->set_preference( 'AuthoritiesLog', 0 );
+$ENV{OVERRIDE_SYSPREF_CataloguingLog} = 0;
+$ENV{OVERRIDE_SYSPREF_AuthoritiesLog} = 0;
if ($fk_off) {
$dbh->do("SET FOREIGN_KEY_CHECKS = 0");
my $marcFlavour = C4::Context->preference('marcflavour') || 'MARC21';
+# The definition of $searcher must be before MARC::Batch->new
+my $searcher = Koha::SearchEngine::Search->new(
+ {
+ index => (
+ $authorities
+ ? $Koha::SearchEngine::AUTHORITIES_INDEX
+ : $Koha::SearchEngine::BIBLIOS_INDEX
+ )
+ }
+);
+
print "Characteristic MARC flavour: $marcFlavour\n" if $verbose;
my $starttime = gettimeofday;
my $batch;
}
else {
( $tagid, $subfieldid ) =
- GetMarcFromKohaField( "biblio.biblionumber", $framework );
+ GetMarcFromKohaField( "biblio.biblionumber" );
$tagid||="001";
}
# the SQL query to search on isbn
my $sth_isbn = $dbh->prepare("SELECT biblionumber,biblioitemnumber FROM biblioitems WHERE isbn=?");
-$dbh->{AutoCommit} = 0;
my $loghandle;
if ($logfile){
$loghandle= IO::File->new($logfile, $writemode) ;
print $loghandle "id;operation;status\n";
}
-my $searcher = Koha::SearchEngine::Search->new(
- {
- index => (
- $authorities
- ? $Koha::SearchEngine::AUTHORITIES_INDEX
- : $Koha::SearchEngine::BIBLIOS_INDEX
- )
- }
-);
-
+my $logger = Koha::Logger->get;
+my $schema = Koha::Database->schema;
+$schema->txn_begin;
RECORD: while ( ) {
my $record;
# get records
require C4::Search;
my $query = build_query( $match, $record );
my $server = ( $authorities ? 'authorityserver' : 'biblioserver' );
- $debug && warn $query;
my ( $error, $results, $totalhits ) = $searcher->simple_search_compat( $query, 0, 3, [$server] );
# changed to warn so able to continue with one broken record
if ( defined $error ) {
printlog( { id => $id || $originalid || $match, op => "match", status => "ERROR" } ) if ($logfile);
next RECORD;
}
- $debug && warn "$query $server : $totalhits";
if ( $results && scalar(@$results) == 1 ) {
my $marcrecord = C4::Search::new_record_from_zebra( $server, $results->[0] );
SetUTF8Flag($marcrecord);
push @subfields, map { ( $_->[0] =~ /[a-z]/ ? $_->[1] : () ) } $field->subfields();
}
$yamlhash->{$originalid}->{'subfields'} = \@subfields;
+ $yamlhash->{$originalid}->{'updated'} = 0;
}
next;
}
}
} elsif ( $results && scalar(@$results) > 1 ) {
- $debug && warn "more than one match for $query";
+ $logger->debug("more than one match for $query");
} else {
- $debug && warn "nomatch for $query";
+ $logger->debug("nomatch for $query");
}
}
if ($keepids && $originalid) {
if ( length($stringfilter) == 3 ) {
foreach my $field ( $record->field($stringfilter) ) {
$record->delete_field($field);
- $debug && warn "removed : ", $field->as_string;
+ $logger->debug("removed : ", $field->as_string);
}
} elsif ($stringfilter =~ /([0-9]{3})([a-z0-9])(.*)/) {
my $removetag = $1;
if ( ( $removetag > "010" ) && $removesubfield ) {
foreach my $field ( $record->field($removetag) ) {
$field->delete_subfield( code => "$removesubfield", match => $removematch );
- $debug && warn "Potentially removed : ", $field->subfield($removesubfield);
+ $logger->debug("Potentially removed : ", $field->subfield($removesubfield));
}
}
}
printlog({id=>$originalid||$id||$authid, op=>"edit",status=>"ok"}) if ($logfile);
}
}
- elsif (defined $authid) {
- ## An authid is defined but no authority in database : add
- eval { ( $authid ) = AddAuthority($record,$authid, $authtypecode) };
- if ($@){
- warn "Problem with authority $authid Cannot Add ".$@;
- printlog({id=>$originalid||$id||$authid, op=>"insert",status=>"ERROR"}) if ($logfile);
- }
- else{
- printlog({id=>$originalid||$id||$authid, op=>"insert",status=>"ok"}) if ($logfile);
- }
- }
else {
## True insert in database
eval { ( $authid ) = AddAuthority($record,"", $authtypecode) };
push @subfields, map { ( $_->[0] =~ /[a-z]/ ? $_->[1] : () ) } $field->subfields();
}
$yamlhash->{$originalid}->{'subfields'} = \@subfields;
+ $yamlhash->{$originalid}->{'updated'} = 1;
}
}
else {
if ($sourcetag < "010"){
if ($record->field($sourcetag)){
my $source = $record->field($sourcetag)->data();
- printf(IDMAP "%s|%s\n",$source,$biblionumber);
+ printf($idmapfh "%s|%s\n",$source,$biblionumber);
}
} else {
my $source=$record->subfield($sourcetag,$sourcesubfield);
- printf(IDMAP "%s|%s\n",$source,$biblionumber);
+ printf($idmapfh "%s|%s\n",$source,$biblionumber);
}
}
# create biblio, unless we already have it ( either match or isbn )
$biblioitemnumber = Koha::Biblios->find( $biblionumber )->biblioitem->biblioitemnumber;
};
if ($update) {
- eval { ModBiblio( $record, $biblionumber, GetFrameworkCode($biblionumber) ) };
+ eval { ModBiblio( $record, $biblionumber, $framework ) };
if ($@) {
warn "ERROR: Edit biblio $biblionumber failed: $@\n";
printlog( { id => $id || $originalid || $biblionumber, op => "update", status => "ERROR" } ) if ($logfile);
}
} else {
if ($insert) {
- eval { ( $biblionumber, $biblioitemnumber ) = AddBiblio( $record, '', { defer_marc_save => 1 } ) };
+ eval { ( $biblionumber, $biblioitemnumber ) = AddBiblio( $record, $framework, { defer_marc_save => 1 } ) };
if ($@) {
warn "ERROR: Adding biblio $biblionumber failed: $@\n";
printlog( { id => $id || $originalid || $biblionumber, op => "insert", status => "ERROR" } ) if ($logfile);
C4::Biblio::_strip_item_fields($clone_record, '');
# This sets the marc fields if there was an error, and also calls
# defer_marc_save.
- ModBiblioMarc( $clone_record, $biblionumber, $framework );
+ ModBiblioMarc( $clone_record, $biblionumber );
if ( $error_adding ) {
warn "ERROR: Adding items to bib $biblionumber failed: $error_adding";
printlog({id=>$id||$originalid||$biblionumber, op=>"insertitem",status=>"ERROR"}) if ($logfile);
}
if ($dedup_barcode && grep { exists $_->{error_code} && $_->{error_code} eq 'duplicate_barcode' } @$errors_ref) {
# Find the record called 'barcode'
- my ($tag, $sub) = C4::Biblio::GetMarcFromKohaField('items.barcode', $framework);
+ my ($tag, $sub) = C4::Biblio::GetMarcFromKohaField( 'items.barcode' );
# Now remove any items that didn't have a duplicate_barcode error,
# erase the barcodes on items that did, and re-add those items.
my %dupes;
printlog({id=>$id||$originalid||$biblionumber, op=>"insertitem",status=>"ERROR"}) if ($logfile);
# if we failed because of an exception, assume that
# the MARC columns in biblioitems were not set.
- ModBiblioMarc( $record, $biblionumber, $framework );
+ ModBiblioMarc( $record, $biblionumber );
next RECORD;
} else {
printlog({id=>$id||$originalid||$biblionumber, op=>"insertitem",status=>"ok"}) if ($logfile);
}
$yamlhash->{$originalid} = $biblionumber if ($yamlfile);
}
- $dbh->commit() if (0 == $i % $commitnum);
+ if ( 0 == $i % $commitnum ) {
+ $schema->txn_commit;
+ $schema->txn_begin;
+ }
}
print $record->as_formatted()."\n" if ($verbose//0)==2;
last if $i == $number;
}
-$dbh->commit();
-$dbh->{AutoCommit} = 1;
-
+$schema->txn_commit;
if ($fk_off) {
$dbh->do("SET FOREIGN_KEY_CHECKS = 1");
}
-# Restore CataloguingLog
-C4::Context->set_preference( 'CataloguingLog', $CataloguingLog );
-# Restore AuthoritiesLog
-C4::Context->set_preference( 'AuthoritiesLog', $AuthoritiesLog );
+# Restore CataloguingLog and AuthoritiesLog
+delete $ENV{OVERRIDE_SYSPREF_CataloguingLog};
+delete $ENV{OVERRIDE_SYSPREF_AuthoritiesLog};
my $timeneeded = gettimeofday - $starttime;
print "\n$i MARC records done in $timeneeded seconds\n";
}
if ($yamlfile) {
open my $yamlfileout, q{>}, "$yamlfile" or die "cannot open $yamlfile \n";
- print $yamlfileout Dump($yamlhash);
+ print $yamlfileout Encode::decode_utf8(YAML::XS::Dump($yamlhash));
}
exit 0;
my $string = build_simplequery($matchingpoint,$record);
push @searchstrings,$string if (length($string)>0);
}
- my $QParser;
- $QParser = C4::Context->queryparser if (C4::Context->preference('UseQueryParser'));
- my $op;
- if ($QParser) {
- $op = '&&';
- } else {
- $op = 'and';
- }
+ my $op = 'and';
return join(" $op ",@searchstrings);
}
sub build_simplequery {
}
}
}
- my $QParser;
- $QParser = C4::Context->queryparser if (C4::Context->preference('UseQueryParser'));
- my $op;
- if ($QParser) {
- $op = '&&';
- } else {
- $op = 'and';
- }
+ my $op = 'and';
return join(" $op ",@searchstrings);
}
sub report_item_errors {
sub get_heading_fields{
my $headingfields;
if ($authtypes){
- $headingfields=YAML::LoadFile($authtypes);
+ $headingfields = YAML::XS::LoadFile($authtypes);
$headingfields={C4::Context->preference('marcflavour')=>$headingfields};
- $debug && warn YAML::Dump($headingfields);
+ $logger->debug(Encode::decode_utf8(YAML::XS::Dump($headingfields)));
}
unless ($headingfields){
$headingfields=$dbh->selectall_hashref("SELECT auth_tag_to_report, authtypecode from auth_types",'auth_tag_to_report',{Slice=>{}});
projects / srvgit / blobdiff