projects
/
koha.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'kc/new/bug_5616' into kcmaster
[koha.git]
/
catalogue
/
showmarc.pl
diff --git
a/catalogue/showmarc.pl
b/catalogue/showmarc.pl
index
bd557e9
..
5e03798
100755
(executable)
--- a/
catalogue/showmarc.pl
+++ b/
catalogue/showmarc.pl
@@
-25,9
+25,12
@@
use strict;
#use warnings; FIXME - Bug 2505
use strict;
#use warnings; FIXME - Bug 2505
+use open OUT=>':utf8', ':std';
+
# standard or CPAN modules used
use CGI qw(:standard);
use DBI;
# standard or CPAN modules used
use CGI qw(:standard);
use DBI;
+use Encode;
# Koha modules used
use C4::Context;
# 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);
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 {
} else {
@@
-87,5
+88,7
@@
$record =GetMarcBiblio($biblionumber) unless $record;
my $formatted = $record->as_formatted;
$template->param( MARC_FORMATTED => $formatted );
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;
}
}