From 1a6a1f202a000cbe05abae163c38a95ee2db657b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Demians?= Date: Sun, 2 Nov 2014 08:59:30 +0100 Subject: [PATCH] Bug 13170 Remove of prog theme broke the OPAC's "view plain" option for MARC details In the OPAC if you view the MARC details for a title (and have OPACXSLTDetailsDisplay enabled) there is a "view plain" link which displays the output of opac-showmarc.pl. This is broken in master: fixed by this patch. Note: Implemented with C4::XSLT::_get_best_default_xslt_filename() to keep code orthogonal. Test plan: (1) Set OPACXSLTDetailsDisplay to default (2) Do a search on OPAC, then display a specific biblio record (3) Click on MARC view tab. Then click on 'view plain' link. Nothing is displayed. (4) Apply the patch. And refresh the MARC detail page. (5) Click on 'view plain' link. Check that a plain text MARC record is displayed. --- opac/opac-showmarc.pl | 29 +++++++++-------------------- 1 file changed, 9 insertions(+), 20 deletions(-) diff --git a/opac/opac-showmarc.pl b/opac/opac-showmarc.pl index 702fb1b..219186c 100755 --- a/opac/opac-showmarc.pl +++ b/opac/opac-showmarc.pl @@ -52,26 +52,15 @@ if(!ref $record) { } if ($view eq 'card' || $view eq 'html') { - my $xmlrecord= $importid? $record->as_xml(): GetXmlBiblio($biblionumber); - my $xslfile; - my $xslfilename; - my $htdocs = C4::Context->config('opachtdocs'); - my $theme = C4::Context->preference("opacthemes"); - my $lang = C4::Languages::getlanguage($input); - - if ($view eq 'card'){ - $xslfile = "compact.xsl"; - } - else { # must be html - $xslfile = 'plainMARC.xsl'; - } - $xslfilename = "$htdocs/$theme/$lang/xslt/$xslfile"; - $xslfilename = "$htdocs/$theme/en/xslt/$xslfile" unless ( $lang ne 'en' && -f $xslfilename ); - $xslfilename = "$htdocs/prog/$lang/xslt/$xslfile" unless ( -f $xslfile ); - $xslfilename = "$htdocs/prog/en/xslt/$xslfile" unless ( $lang ne 'en' && -f $xslfilename ); - - my $newxmlrecord = C4::XSLT::engine->transform($xmlrecord, $xslfilename); - print $input->header(-charset => 'UTF-8'), Encode::encode_utf8($newxmlrecord); + my $xml = $importid ? $record->as_xml(): GetXmlBiblio($biblionumber); + my $xsl = C4::XSLT::_get_best_default_xslt_filename( + C4::Context->config('opachtdocs'), + C4::Context->preference('opacthemes'), + C4::Languages::getlanguage($input), + $view eq 'card' ? 'compact.xsl' : 'plainMARC.xsl' + ); + print $input->header(-charset => 'UTF-8'), + Encode::encode_utf8(C4::XSLT::engine->transform($xml, $xsl)); } else { #view eq marc my ( $template, $loggedinuser, $cookie ) = get_template_and_user({ -- 2.1.2