From 636d82a13212f581d84a533e253e1c9b1d667296 Mon Sep 17 00:00:00 2001 From: Marcel de Rooy Date: Mon, 10 Oct 2011 13:04:34 +0200 Subject: [PATCH] 5616 Follow up patch Content-Type: text/plain; charset="utf-8" Decode data from xslt only if needed. Add instruction to use UTF8 in html header. --- catalogue/showmarc.pl | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/catalogue/showmarc.pl b/catalogue/showmarc.pl index bd557e9..b51b380 100755 --- a/catalogue/showmarc.pl +++ b/catalogue/showmarc.pl @@ -28,6 +28,7 @@ use strict; # standard or CPAN modules used use CGI qw(:standard); use DBI; +use Encode; # Koha modules used use C4::Context; @@ -75,10 +76,8 @@ my $style_doc = $parser->parse_file($xslfile); my $stylesheet = $xslt->parse_stylesheet($style_doc); my $results = $stylesheet->transform($source); my $newxmlrecord = $stylesheet->output_string($results); -#warn $newxmlrecord; -print "Content-type: text/html\n\n"; -utf8::encode($newxmlrecord); -print $newxmlrecord; +$newxmlrecord=Encode::decode_utf8($newxmlrecord) unless utf8::is_utf8($newxmlrecord); #decode only if not in perl internal format +print $input->header(-charset => 'UTF-8'), $newxmlrecord; } else { -- 1.6.0.6