From 4f6716d96cce020e1b8166c2029188abe419aea8 Mon Sep 17 00:00:00 2001
From: Fridolin Somers <fridolin.somers@biblibre.com>
Date: Thu, 11 Mar 2021 11:46:46 +0100
Subject: [PATCH] Bug 21818: Replace AutoCommit flag with DBIx transaction in
 stage-marc-import.pl

Like it was done in Bug 18806.

Test plan :
Use stage-marc-import.pl with and without patch, with a matcher to find
duplicates

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
(cherry picked from commit ff849fadbade8b72faec52284b58e6f5dd8a71c9)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
(cherry picked from commit e78a027a148dc44ab41d1f3ac0d06a959f99bc22)

Signed-off-by: Andrew Fuerste-Henry <andrew@bywatersolutions.com>
---
 tools/stage-marc-import.pl | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/tools/stage-marc-import.pl b/tools/stage-marc-import.pl
index a0e7c322be..c9083a18b2 100755
--- a/tools/stage-marc-import.pl
+++ b/tools/stage-marc-import.pl
@@ -104,7 +104,6 @@ if ($completedJobID) {
         # BatchStageMarcRecords can handle that
 
     my $job = undef;
-    my $dbh;
     if ($runinbackground) {
         my $job_size = scalar(@$marcrecords);
         # if we're matching, job size is doubled
@@ -137,9 +136,9 @@ if ($completedJobID) {
 
     }
 
-    # New handle, as we're a child.
-    $dbh = C4::Context->dbh({new => 1});
-    $dbh->{AutoCommit} = 0;
+    my $schema = Koha::Database->new->schema;
+    $schema->storage->txn_begin;
+
     # FIXME branch code
     my ( $batch_id, $num_valid, $num_items, @import_errors ) =
       BatchStageMarcRecords(
@@ -148,7 +147,7 @@ if ($completedJobID) {
         $marc_modification_template,
         $comments,       '',
         $parse_items,    0,
-        50, staging_progress_callback( $job, $dbh )
+        50, staging_progress_callback( $job )
       );
 
     my $num_with_matches = 0;
@@ -162,17 +161,18 @@ if ($completedJobID) {
             $matcher_code = $matcher->code();
             $num_with_matches =
               BatchFindDuplicates( $batch_id, $matcher, 10, 50,
-                matching_progress_callback( $job, $dbh ) );
+                matching_progress_callback($job) );
             SetImportBatchMatcher($batch_id, $matcher_id);
             SetImportBatchOverlayAction($batch_id, $overlay_action);
             SetImportBatchNoMatchAction($batch_id, $nomatch_action);
             SetImportBatchItemAction($batch_id, $item_action);
-            $dbh->commit();
+            $schema->storage->txn_commit;
         } else {
             $matcher_failed = 1;
+            $schema->storage->txn_rollback;
         }
     } else {
-        $dbh->commit();
+        $schema->storage->txn_commit;
     }
 
     my $results = {
@@ -232,7 +232,6 @@ exit 0;
 
 sub staging_progress_callback {
     my $job = shift;
-    my $dbh = shift;
     return sub {
         my $progress = shift;
         $job->progress($progress);
@@ -241,7 +240,6 @@ sub staging_progress_callback {
 
 sub matching_progress_callback {
     my $job = shift;
-    my $dbh = shift;
     my $start_progress = $job->progress();
     return sub {
         my $progress = shift;
-- 
2.39.5