From 8c6da900f48833a57378d97a45250d0ecde350b4 Mon Sep 17 00:00:00 2001 From: Marcel de Rooy Date: Thu, 4 Oct 2012 13:40:51 +0200 Subject: [PATCH] Bug 8872: Changes for opac-showmarc Simplifies template (eliminating opac-bottom include). Makes encoding for card and html view more consistent with approach in Templates module. Rearranges a few lines in script for consistency and performance. Signed-off-by: Jared Camins-Esakov Passed-QA-by: Mason James Signed-off-by: Jared Camins-Esakov --- .../prog/en/modules/opac-showmarc.tt | 8 ++-- opac/opac-showmarc.pl | 43 ++++++++----------- 2 files changed, 24 insertions(+), 27 deletions(-) diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-showmarc.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-showmarc.tt index 3a5a9f8628..452d56521a 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-showmarc.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-showmarc.tt @@ -1,8 +1,10 @@ -[% INCLUDE 'doc-head-open.inc' %]MARC view +[% INCLUDE 'doc-head-open.inc' %] +MARC view

[% MARC_FORMATTED %]

- -[% INCLUDE 'opac-bottom.inc' %] +

+ + diff --git a/opac/opac-showmarc.pl b/opac/opac-showmarc.pl index f06d3cde0b..b958485689 100755 --- a/opac/opac-showmarc.pl +++ b/opac/opac-showmarc.pl @@ -27,8 +27,6 @@ use strict; use warnings; -use open OUT=> ":encoding(UTF-8)", ':std'; - # standard or CPAN modules used use CGI; use Encode; @@ -45,29 +43,20 @@ use XML::LibXML; my $input = new CGI; my $biblionumber = $input->param('id'); $biblionumber = int($biblionumber); -my $importid = $input->param('importid'); -my $view = $input->param('viewas') || 'marc'; - -my ( $template, $loggedinuser, $cookie ) = get_template_and_user({ - template_name => "opac-showmarc.tmpl", - query => $input, - type => "opac", - authnotrequired => ( C4::Context->preference("OpacPublic") ? 1 : 0 ), - debug => 1, -}); +my $importid= $input->param('importid'); +my $view= $input->param('viewas') || 'marc'; -$template->param( SCRIPT_NAME => $ENV{'SCRIPT_NAME'}, ); -my ($record, $xmlrecord); +my $record; if ($importid) { - my ($marc,$encoding) = GetImportRecordMarc($importid); - $record = MARC::Record->new_from_usmarc($marc) ; - if($view eq 'card') { - $xmlrecord = $record->as_xml(); - } + my ($marc) = GetImportRecordMarc($importid); + $record = MARC::Record->new_from_usmarc($marc); +} +else { + $record =GetMarcBiblio($biblionumber); } if ($view eq 'card' || $view eq 'html') { - $xmlrecord = GetXmlBiblio($biblionumber) unless $xmlrecord; + my $xmlrecord= $importid? $record->as_xml(): GetXmlBiblio($biblionumber); my $xslfile; my $themelang = '/' . C4::Context->preference("opacthemes") . '/' . C4::Templates::_current_language(); @@ -84,10 +73,16 @@ if ($view eq 'card' || $view eq 'html') { 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); - print $input->header(-charset => 'UTF-8'), $newxmlrecord; -} else { - $record =GetMarcBiblio($biblionumber) unless $record; + print $input->header(-charset => 'UTF-8'), Encode::encode_utf8($newxmlrecord); +} +else { #view eq marc + my ( $template, $loggedinuser, $cookie ) = get_template_and_user({ + template_name => "opac-showmarc.tmpl", + query => $input, + type => "opac", + authnotrequired => ( C4::Context->preference("OpacPublic") ? 1 : 0 ), + debug => 1, + }); $template->param( MARC_FORMATTED => $record->as_formatted ); output_html_with_http_headers $input, $cookie, $template->output; } -- 2.39.5