From 465f33b09b1193b7bb8fab3a8b5076c0943f7d20 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Wed, 10 Feb 2021 11:30:45 +0100 Subject: [PATCH] Bug 27669: Fix 'importing' and 'reverting' statuses when importing/reverting a batch SetImportBatchStatus is not called with $batch_id It has been caught by bug 25026, and www/search_utf8.t fails with t/db_dependent/www/search_utf8.t .. 14/87 Error POSTing http://koha:8081/cgi-bin/koha/tools/manage-marc-import.pl: Internal Server Error at t/db_dependent/www/search_utf8.t line 240. And, from logs: manage-marc-import.pl: C4::ImportBatch::SetImportBatchStatus(): DBI Exception: DBD::mysql::st execute failed: Truncated incorrect DOUBLE value: 'importing' [for Statement "UPDATE import_batches SET import_status = ? WHERE import_batch_id = ?" with ParamValues: 0=undef, 1='importing'] at /kohadevbox/koh a/C4/ImportBatch.pm line 579: /kohadevbox/koha/tools/manage-marc-import.pl, referer: http://koha:8081/cgi-bin/koha/tools/manage-marc-import.pl?import_batch_id=2 Test plan: Read the changes and confirm it does make sense. Import and revert a batch Signed-off-by: Jonathan Druart (cherry picked from commit a86242c2ea6ecdc2e9cf26dd7343c09926f68287) Signed-off-by: Fridolin Somers --- C4/ImportBatch.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/C4/ImportBatch.pm b/C4/ImportBatch.pm index 7064f94728..9095aec4b5 100644 --- a/C4/ImportBatch.pm +++ b/C4/ImportBatch.pm @@ -576,7 +576,7 @@ sub BatchCommitRecords { my $num_items_errored = 0; my $num_ignored = 0; # commit (i.e., save, all records in the batch) - SetImportBatchStatus('importing'); + SetImportBatchStatus($batch_id, 'importing'); my $overlay_action = GetImportBatchOverlayAction($batch_id); my $nomatch_action = GetImportBatchNoMatchAction($batch_id); my $item_action = GetImportBatchItemAction($batch_id); @@ -813,7 +813,7 @@ sub BatchRevertRecords { my $num_ignored = 0; my $num_items_deleted = 0; # commit (i.e., save, all records in the batch) - SetImportBatchStatus('reverting'); + SetImportBatchStatus($batch_id, 'reverting'); my $overlay_action = GetImportBatchOverlayAction($batch_id); my $nomatch_action = GetImportBatchNoMatchAction($batch_id); my $dbh = C4::Context->dbh; -- 2.39.5