gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 5616: UTF-8 problem in Card View / Follow up 

Decode data only if needed.
Add instruction to use UTF8 in html header.
Force utf8 on output handle.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Umlauts and other diacritics in card view of z39.50 search are now
correctly displayed.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
  removed 2 commented lines

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 980d8fbed4)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
This commit is contained in:
Marcel de Rooy 2011-10-10 13:04:34 +02:00 committed by Chris Nighswonger
parent 1d6553710f
commit 56ea10433c
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
catalogue/showmarc.pl
View File

@ -25,9 +25,12 @@
use strict;
#use warnings; FIXME - Bug 2505
use open OUT=>':utf8', ':std';
# standard or CPAN modules used
use CGI qw(:standard);
use DBI;
use Encode;
# Koha modules used
use C4::Context;
@ -75,10 +78,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 {
@ -87,5 +88,7 @@ $record =GetMarcBiblio($biblionumber) unless $record;
my $formatted = $record->as_formatted;
$template->param( MARC_FORMATTED => $formatted );
output_html_with_http_headers $input, $cookie, $template->output;
my $output= $template->output;
$output=Encode::decode_utf8($output) unless utf8::is_utf8($output);
output_html_with_http_headers $input, $cookie, $output;
}