Tomas Cohen Arazi
6619a752d9
This patch fixes the broken commit_file.pl script. It doesn't deal with commiting the import from the UI. To test: 1. Pick a file for staging: $ kshell k$ misc/stage_file.pl --file TestDataImportKoha.mrc => SUCCESS: All good 2. Commit! k$ misc/commit_file.pl --batch-number 1 => FAIL: You see DBIx::Class::Storage::DBI::_exec_txn_begin(): DBI Exception: DBD::mysql::db begin_work failed: Already in a transaction at /kohadevbox/koha/C4/Biblio.pm line 303 3. Apply this patch 4. Repeat 2 => SUCCESS: Commit succeeds 5. Sign off :-D Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Bug 29325: (QA follow-up) Remove unexisting parameters of BatchRevertRecords There is no interval and callback as in BatchCommitRecords. Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Bug 29325: Call progress callback one last time to confirm comppletion Previously after finishing the loop we were still in a transaction that never completed - we should report progress when done one final time to commit the last records To test: 1 - Stage a file with > 100 records 2 - Commit file 3 - Confirm batch is imported and no records left as staged Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Bug 29325: Fix import from staff client same test as before, but via the staff client Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Bug 29325: Handle the transaction in BatchCommitRecords Requiring the callback to commit was breaking reversion, and likely elsewhere Let's simplify and say that the routine iteself will handle the txn and commit TO test: 1 - Stage a file 2 - Import a file 3 - Revert a file 4 - Test staff client and command line Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Bug 29325: (QA follow-up) Tidy up tools/manage-marc-import.pl: sub commit_batch does no longer need $schema tools/manage-marc-import.pl: sub revert_batch: calling BatchRevertRecords which has no interval and callback misc/commit_file.pl: sub print_progress_and_commit does no longer commit, renamed misc/commit_file.pl: sub print_progress does no longer have a schema parameter misc/commit_file.pl: sub revert_batch reported deleted items as added Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
153 lines
4.8 KiB
Perl
Executable file
153 lines
4.8 KiB
Perl
Executable file
#!/usr/bin/perl
|
|
|
|
use Modern::Perl;
|
|
|
|
BEGIN {
|
|
# find Koha's Perl modules
|
|
# test carefully before changing this
|
|
use FindBin ();
|
|
eval { require "$FindBin::Bin/kohalib.pl" };
|
|
}
|
|
|
|
use Koha::Script;
|
|
use C4::Context;
|
|
use C4::ImportBatch qw( GetAllImportBatches GetImportBatch BatchCommitRecords BatchRevertRecords );
|
|
use Getopt::Long qw( GetOptions );
|
|
|
|
$| = 1;
|
|
|
|
# command-line parameters
|
|
my $batch_number = "";
|
|
my $list_batches = 0;
|
|
my $revert = 0;
|
|
my $want_help = 0;
|
|
my $framework = '';
|
|
|
|
my $result = GetOptions(
|
|
'batch-number:s' => \$batch_number,
|
|
'list-batches' => \$list_batches,
|
|
'framework:s' => \$framework,
|
|
'revert' => \$revert,
|
|
'h|help' => \$want_help
|
|
);
|
|
|
|
if ($want_help or (not $batch_number and not $list_batches)) {
|
|
print_usage();
|
|
exit 0;
|
|
}
|
|
|
|
if ($list_batches) {
|
|
list_batches();
|
|
exit 0;
|
|
}
|
|
|
|
# FIXME dummy user so that logging won't fail
|
|
# in future, probably should tie to a real user account
|
|
C4::Context->set_userenv(0, 'batch', 0, 'batch', 'batch', 'batch', 'batch');
|
|
|
|
if ($batch_number =~ /^\d+$/ and $batch_number > 0) {
|
|
my $batch = GetImportBatch($batch_number);
|
|
die "$0: import batch $batch_number does not exist in database\n" unless defined $batch;
|
|
if ($revert) {
|
|
die "$0: import batch $batch_number status is '" . $batch->{'import_status'} . "', and therefore cannot be imported\n"
|
|
unless $batch->{'import_status'} eq "imported";
|
|
revert_batch($batch_number);
|
|
} else {
|
|
die "$0: import batch $batch_number status is '" . $batch->{'import_status'} . "', and therefore cannot be imported\n"
|
|
unless $batch->{'import_status'} eq "staged" or $batch->{'import_status'} eq "reverted";
|
|
process_batch($batch_number);
|
|
}
|
|
} else {
|
|
die "$0: please specify a numeric batch ID\n";
|
|
}
|
|
|
|
exit 0;
|
|
|
|
sub list_batches {
|
|
my $results = GetAllImportBatches();
|
|
print sprintf("%5.5s %-25.25s %-25.25s %-10.10s\n", "#", "File name", "Batch comments", "Status");
|
|
print '-' x 5, ' ' , '-' x 25, ' ', '-' x 25, ' ', '-' x 10, "\n" ;
|
|
foreach my $batch (@{ $results}) {
|
|
if ($batch->{'import_status'} eq "staged" or $batch->{'import_status'} eq "reverted") {
|
|
print sprintf("%5.5s %-25.25s %-25.25s %-10.10s\n",
|
|
$batch->{'import_batch_id'},
|
|
$batch->{'file_name'},
|
|
$batch->{'comments'},
|
|
$batch->{'import_status'});
|
|
}
|
|
}
|
|
}
|
|
|
|
sub process_batch {
|
|
my ($import_batch_id) = @_;
|
|
|
|
print "... importing MARC records -- please wait\n";
|
|
my ($num_added, $num_updated, $num_items_added, $num_items_replaced, $num_items_errored, $num_ignored) =
|
|
BatchCommitRecords($import_batch_id, $framework, 100, \&print_progress);
|
|
print "... finished importing MARC records\n";
|
|
|
|
print <<_SUMMARY_;
|
|
|
|
MARC record import report
|
|
----------------------------------------
|
|
Batch number: $import_batch_id
|
|
Number of new records added: $num_added
|
|
Number of records replaced: $num_updated
|
|
Number of records ignored: $num_ignored
|
|
Number of items added: $num_items_added
|
|
Number of items replaced: $num_items_replaced
|
|
Number of items ignored: $num_items_errored
|
|
|
|
Note: an item is ignored if its barcode is a
|
|
duplicate of one already in the database.
|
|
_SUMMARY_
|
|
}
|
|
|
|
sub revert_batch {
|
|
my ($import_batch_id) = @_;
|
|
|
|
print "... reverting batch -- please wait\n";
|
|
my ($num_deleted, $num_errors, $num_reverted, $num_items_deleted, $num_ignored) =
|
|
BatchRevertRecords( $import_batch_id );
|
|
print "... finished reverting batch\n";
|
|
|
|
print <<_SUMMARY_;
|
|
|
|
MARC record import report
|
|
----------------------------------------
|
|
Batch number: $import_batch_id
|
|
Number of records deleted: $num_deleted
|
|
Number of errors: $num_errors
|
|
Number of records reverted: $num_reverted
|
|
Number of records ignored: $num_ignored
|
|
Number of items deleted: $num_items_deleted
|
|
|
|
_SUMMARY_
|
|
}
|
|
|
|
|
|
sub print_progress {
|
|
my ( $recs ) = @_;
|
|
print "... processed $recs records\n";
|
|
}
|
|
|
|
sub print_usage {
|
|
print <<_USAGE_;
|
|
$0: import a batch of staged MARC records into database.
|
|
|
|
Use this batch job to complete the import of a batch of
|
|
MARC records that was staged either by the batch job
|
|
stage_file.pl or by the Koha Tools option
|
|
"Stage MARC Records for Import".
|
|
|
|
Parameters:
|
|
--batch-number <#> number of the record batch
|
|
to import
|
|
--framework <code> add new records using this framework. If
|
|
omitted, the default framework is used.
|
|
--list-batches print a list of record batches
|
|
available to commit
|
|
--revert revert a batch instead of importing it
|
|
--help or -h show this message.
|
|
_USAGE_
|
|
}
|