Merge remote-tracking branch 'kc/new/bug_5616' into kcmaster

diff --combined catalogue/showmarc.pl
index bd557e9,3cb00b5..5e03798
--- 1/catalogue/showmarc.pl
--- 2/catalogue/showmarc.pl
+++ b/catalogue/showmarc.pl
@@@ -1,11 -1,13 +1,11 @@@
  #!/usr/bin/perl
  
 -# $Id: showmarc.pl,v 1.1.2.1 2007/06/18 21:57:23 rangi Exp $
 -
 -
  # Koha library project  www.koha-community.org
  
  # Licensed under the GPL
  
  # Copyright 2007 Liblime
 +# Parts copyright 2010 BibLibre
  #
  # This file is part of Koha.
  #
@@@ -25,9 -27,12 +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 -80,8 +78,8 @@@ my $style_doc = $parser->parse_file($xs
  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 -90,7 +88,7 @@@ $record =GetMarcBiblio($biblionumber) u
  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;
  }