From d50de1f040be4b6498cc054689f524fd7d13321f Mon Sep 17 00:00:00 2001 From: Chris Cormack Date: Thu, 20 Oct 2011 01:52:52 +1300 Subject: [PATCH] Bug 6972 : Followup fixing bad indentation --- catalogue/showmarc.pl | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/catalogue/showmarc.pl b/catalogue/showmarc.pl index 97e7ed7240..a54894b3e2 100755 --- a/catalogue/showmarc.pl +++ b/catalogue/showmarc.pl @@ -68,23 +68,27 @@ if($importid) { if($view eq 'card') { my $themelang = '/' . C4::Context->preference("opacthemes") . '/' . C4::Templates::_current_language(); $xmlrecord = GetXmlBiblio($biblionumber) unless $xmlrecord; -my $xslfile = C4::Context->config('intrahtdocs').$themelang."/xslt/compact.xsl"; -my $parser = XML::LibXML->new(); -my $xslt = XML::LibXSLT->new(); -my $source = $parser->parse_string($xmlrecord); -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); -$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 { + my $xslfile = + C4::Context->config('intrahtdocs') . $themelang . "/xslt/compact.xsl"; + my $parser = XML::LibXML->new(); + my $xslt = XML::LibXSLT->new(); + my $source = $parser->parse_string($xmlrecord); + 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); + $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 { $record =GetMarcBiblio($biblionumber) unless $record; my $formatted = $record->as_formatted; $template->param( MARC_FORMATTED => $formatted ); -my $output= $template->output; -$output=Encode::decode_utf8($output) unless utf8::is_utf8($output); -output_html_with_http_headers $input, $cookie, $output; + my $output= $template->output; + $output=Encode::decode_utf8($output) unless utf8::is_utf8($output); + output_html_with_http_headers $input, $cookie, $output; } -- 2.39.5