From c0f40ce040245f4e3dc238e682dd250ee3c6d478 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Fr=C3=A9d=C3=A9ric=20Demians?= Date: Thu, 23 Jul 2015 09:47:15 +0200 Subject: [PATCH] Bug 14592: Export data bad encoding Tools > Export data produces a file badly encoded, when marc/xml file format is chosen. It works with CSV. To test: 1. Tools > Export data 2. Choose a limited interval of biblionumber 3. Export in marc/xml/csv. 4. Check files exported at 3: csv file is ok. marc/xml files are corrupted, ie badly encoded. 5. Apply the patch 6. Repeat steps 3&4, and confirm that all file formats are valid. Signed-off-by: Tomas Cohen Arazi Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi (cherry picked from commit dfe07fa410eb48241c218abcc156c466576dcc9a) Signed-off-by: Chris Cormack --- tools/export.pl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/export.pl b/tools/export.pl index f63e2c4f6f..2191b027cd 100755 --- a/tools/export.pl +++ b/tools/export.pl @@ -166,7 +166,8 @@ if ( $op eq "export" ) { binmode STDOUT, ':encoding(UTF-8)' if $filename =~ m/\.gz$/ - or $filename =~ m/\.bz2$/; + or $filename =~ m/\.bz2$/ + or $output_format ne 'csv'; if ( $filename =~ m/\.gz$/ ) { $mimetype = 'application/x-gzip'; -- 2.39.5