From b35ea2544bc56f4f30e3352a06bb8e7c8eeb16c5 Mon Sep 17 00:00:00 2001 From: David Gustafsson Date: Thu, 20 Feb 2025 12:36:16 +0100 Subject: [PATCH] Bug 27859: Fix background job error and js progress callback --- Koha/BackgroundJob/SearchResultExport.pm | 5 +++-- koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Koha/BackgroundJob/SearchResultExport.pm b/Koha/BackgroundJob/SearchResultExport.pm index 8c7da62d7b8..6ecf08fc3d6 100644 --- a/Koha/BackgroundJob/SearchResultExport.pm +++ b/Koha/BackgroundJob/SearchResultExport.pm @@ -113,6 +113,7 @@ sub process { my $upload_dir = Koha::UploadedFile->permanent_directory; while (my ($format, $data) = each %{$encoded_results}) { + $data = encode('UTF-8', $data); my $hash = md5_hex($data); my $category = "search_marc_export"; my $time = strftime "%Y%m%d_%H%M", localtime time; @@ -131,7 +132,7 @@ sub process { if ($fh) { $fh->binmode; - print $fh encode('UTF-8', $data); + print $fh $data; $fh->close; my $size = -s $filepath; @@ -159,7 +160,7 @@ sub process { errors => \@errors, query_string => $query_string, }; - $data->{report} = $report; + $data->{report} = $report; if (@errors) { $self->set({ progress => 0, status => 'failed' })->store; } diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt index 37e40dc6ed5..ed242b6fca8 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt @@ -951,7 +951,7 @@ [% Asset.js("js/job_progress.js") | $raw %]