From c19b0f876bc6c1bdebb2ab5e1db80d0ff9aea0a1 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Wed, 14 Jun 2017 15:53:18 -0300 Subject: [PATCH] Bug 18806: Fix batch revert Since bug 18242: When a biblio is deleted, a new transaction is created. tools/manage-marc-import.pl use the AutoCommit flag, which does not allow nested transaction. AutoCommit must not be used. Test plan: Import a batch, then revert it. The biblios must have been correctly deleted, they were not before this patch Signed-off-by: Lee Jamison Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart (cherry picked from commit 3db0401366b8e099ab2046d68cf20a9f754e1eae) Signed-off-by: Fridolin Somers (cherry picked from commit eafd2e7299e3db30d0d84d084fa5e49de60fa748) Signed-off-by: Katrin Fischer --- tools/manage-marc-import.pl | 54 ++++++++++++++++++++++++------------- 1 file changed, 36 insertions(+), 18 deletions(-) diff --git a/tools/manage-marc-import.pl b/tools/manage-marc-import.pl index 83abc91513..9bb5b3f10b 100755 --- a/tools/manage-marc-import.pl +++ b/tools/manage-marc-import.pl @@ -240,15 +240,24 @@ sub commit_batch { my ($template, $import_batch_id, $framework) = @_; my $job = undef; - $dbh->{AutoCommit} = 0; - my $callback = sub {}; - if ($runinbackground) { - $job = put_in_background($import_batch_id); - $callback = progress_callback($job, $dbh); - } - my ($num_added, $num_updated, $num_items_added, $num_items_replaced, $num_items_errored, $num_ignored) = - BatchCommitRecords($import_batch_id, $framework, 50, $callback); - $dbh->commit(); + my ( $num_added, $num_updated, $num_items_added, + $num_items_replaced, $num_items_errored, $num_ignored ); + my $schema = Koha::Database->new->schema; + $schema->storage->txn_do( + sub { + my $callback = sub { }; + if ($runinbackground) { + $job = put_in_background($import_batch_id); + $callback = progress_callback( $job, $dbh ); + } + ( + $num_added, $num_updated, $num_items_added, + $num_items_replaced, $num_items_errored, $num_ignored + ) + = BatchCommitRecords( $import_batch_id, $framework, 50, + $callback ); + } + ); my $results = { did_commit => 1, @@ -269,16 +278,25 @@ sub commit_batch { sub revert_batch { my ($template, $import_batch_id) = @_; - $dbh->{AutoCommit} = 0; my $job = undef; - my $callback = sub {}; - if ($runinbackground) { - $job = put_in_background($import_batch_id); - $callback = progress_callback($job, $dbh); - } - my ($num_deleted, $num_errors, $num_reverted, $num_items_deleted, $num_ignored) = - BatchRevertRecords($import_batch_id, 50, $callback); - $dbh->commit(); + my ( + $num_deleted, $num_errors, $num_reverted, + $num_items_deleted, $num_ignored + ); + my $schema = Koha::Database->new->schema; + $schema->txn_do( + sub { + my $callback = sub { }; + if ($runinbackground) { + $job = put_in_background($import_batch_id); + $callback = progress_callback( $job, $dbh ); + } + ( + $num_deleted, $num_errors, $num_reverted, + $num_items_deleted, $num_ignored + ) = BatchRevertRecords( $import_batch_id, 50, $callback ); + } + ); my $results = { did_revert => 1, -- 2.39.5