From 164ffdb43c98b4d2fa193d80c48f5509294fa1ca Mon Sep 17 00:00:00 2001 From: Tomas Cohen Arazi Date: Tue, 24 May 2016 14:28:44 -0300 Subject: [PATCH] Bug 16578: Fix wide character errors in opac-export.pl MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This simple patch fixes wide character warning raised by opac-export.pl when 'MARC (Unicode/UTF-8)' and 'MARC (Unicode/UTF-8, Standard)' formats are chosen for downloading records. To test: - Have records indexed - Open your OPAC logs: $ tail -f /var/log/koha/kohadev/opac-error.log - Open the detail page in the opac for a record - Choose Save record > MARC (Unicode/UTF-8) => FAIL: opac-export.pl: Wide character in print at /home/vagrant/kohaclone/opac/opac-export.pl line 116., referer: http://localh... - Choose Save record > MARC (Unicode/UTF-8, Standard) => FAILE opac-export.pl: Wide character in print... - Apply the patch - Choose Save record > MARC (Unicode/UTF-8) => SUCCESS: No warnings raised. - Choose Save record > MARC (Unicode/UTF-8, Standard) => SUCCESS: No warnings raised. - Sign off :-D Followed test plan, works as expected. Signed-off-by: Marc Véron Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall (cherry picked from commit 7d4844e171b1319b90e7bd73510bd97c2acbf635) Signed-off-by: Frédéric Demians --- opac/opac-export.pl | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/opac/opac-export.pl b/opac/opac-export.pl index c4ab83ae4a..3f32d1a8a3 100755 --- a/opac/opac-export.pl +++ b/opac/opac-export.pl @@ -17,8 +17,7 @@ # You should have received a copy of the GNU General Public License # along with Koha; if not, see . -use strict; -use warnings; +use Modern::Perl; use C4::Record; use C4::Auth; @@ -107,11 +106,15 @@ else { -charset => 'utf-8', -attachment => "bib-$biblionumber.txt" ); - }else{ + } else { + binmode STDOUT, ':encoding(UTF-8)'; print $query->header( -type => 'application/octet-stream', - -charset=>'utf-8', - -attachment=>"bib-$biblionumber.$format"); + -charset => 'utf-8', + -attachment => "bib-$biblionumber.$format" + ); } print $marc; } + +1; -- 2.39.5