X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=opac%2Fopac-showmarc.pl;h=c78b5b14b4a37c550d92741e141962b2e95ce3bb;hb=42c829837cef09fa5449ec415ec2926784830ddb;hp=b95848568946d5fd9edba79bfbef0410f5fde05f;hpb=5c52ab34d01471a6e8f88f22c8c53e2f91863bc2;p=koha_fer

diff --git a/opac/opac-showmarc.pl b/opac/opac-showmarc.pl
index b958485689..c78b5b14b4 100755
--- a/opac/opac-showmarc.pl
+++ b/opac/opac-showmarc.pl
@@ -54,22 +54,34 @@ if ($importid) {
 else {
     $record =GetMarcBiblio($biblionumber);
 }
+if(!ref $record) {
+    print $input->redirect("/cgi-bin/koha/errors/404.pl");
+    exit;
+}
 
 if ($view eq 'card' || $view eq 'html') {
     my $xmlrecord= $importid? $record->as_xml(): GetXmlBiblio($biblionumber);
     my $xslfile;
-    my $themelang = '/' . C4::Context->preference("opacthemes") .  '/' . C4::Templates::_current_language();
+    my $xslfilename;
+    my $htdocs  = C4::Context->config('opachtdocs');
+    my $theme   = C4::Context->preference("opacthemes");
+    my $lang = C4::Templates::_current_language();
 
     if ($view eq 'card'){
-        $xslfile = C4::Context->config('opachtdocs').$themelang."/xslt/compact.xsl";
+        $xslfile = "compact.xsl";
     }
     else { # must be html
-        $xslfile = C4::Context->config('opachtdocs').$themelang."/xslt/MARC21slim2OPACMARCdetail.xsl";
+        $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 $parser = XML::LibXML->new();
     my $xslt   = XML::LibXSLT->new();
     my $source = $parser->parse_string($xmlrecord);
-    my $style_doc = $parser->parse_file($xslfile);
+    my $style_doc = $parser->parse_file($xslfilename);
     my $stylesheet = $xslt->parse_stylesheet($style_doc);
     my $results = $stylesheet->transform($source);
     my $newxmlrecord = $stylesheet->output_string($results);