From d2867b6266a300495cbd82b8138016f33800cd88 Mon Sep 17 00:00:00 2001 From: David Gustafsson Date: Mon, 26 Sep 2022 16:55:36 +0200 Subject: [PATCH] Bug 29440: Only log items has been inserted if actually have been so, and remove extra out of place logging of record insertion Signed-off-by: =?UTF-8?q?Micha=C5=82=20Kula?= <148193449+mkibp@users.noreply.github.com> --- misc/migration_tools/bulkmarcimport.pl | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/misc/migration_tools/bulkmarcimport.pl b/misc/migration_tools/bulkmarcimport.pl index aaa61cd6210..417b6b27c6f 100755 --- a/misc/migration_tools/bulkmarcimport.pl +++ b/misc/migration_tools/bulkmarcimport.pl @@ -578,9 +578,6 @@ RECORD: foreach my $record (@{$marc_records}) { # the MARC columns in biblioitems were not set. next RECORD; } - else { - printlog({ id => $record_id, op => "insert items", status => "ok" }) 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'); @@ -611,8 +608,8 @@ RECORD: foreach my $record (@{$marc_records}) { } # Now re-add the record as before, adding errors to the prev list my $more_errors; - eval { ($itemnumbers_ref, $more_errors) = AddItemBatchFromMarc($record, $record_id, $biblioitemnumber, ''); }; - $record_has_added_items ||= @{$itemnumbers_ref}; + eval { ($itemnumbers_ref, $more_errors) = + AddItemBatchFromMarc($record, $record_id, $biblioitemnumber, ''); }; if ($@) { warn "ERROR: Adding items to bib $record_id failed: $@\n"; printlog({ id => $record_id, op => "insert items", status => "ERROR" }) if ($logfile); @@ -624,11 +621,16 @@ RECORD: foreach my $record (@{$marc_records}) { ModBiblioMarc($record, $record_id, $mod_biblio_options); next RECORD; } - else { - printlog({ id => $record_id, op => "insert", status => "ok" }) if ($logfile); + $record_has_added_items ||= @{$itemnumbers_ref}; + if (@{$more_errors}) { + push @$errors_ref, @{$more_errors}; } - push @$errors_ref, @{$more_errors}; } + + if ($record_has_added_items) { + printlog({ id => $record_id, op => "insert items", status => "ok" }) if ($logfile); + } + if (@{$errors_ref}) { report_item_errors($record_id, $errors_ref); } -- 2.40.0