From b6049dd7c7152e892104ba75896c034f8dc57071 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Demians?= <f.demians@tamil.fr>
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.
---
 tools/export.pl | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/export.pl b/tools/export.pl
index f63e2c4..2191b02 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.4.1