X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=opac%2Fopac-showmarc.pl;h=9b75ae7cacb48a4692033151e9e78044fe965256;hb=5d6c092921919526ade501facb1220f8a108a08f;hp=71fb8047973b0c9e38a49ce94204b31d0b593cfe;hpb=18c513d45020c00c5c95284d41529038bbe307ff;p=koha_fer

diff --git a/opac/opac-showmarc.pl b/opac/opac-showmarc.pl
index 71fb804797..9b75ae7cac 100755
--- a/opac/opac-showmarc.pl
+++ b/opac/opac-showmarc.pl
@@ -1,19 +1,12 @@
 #!/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
 #
 # This file is part of Koha.
 #
 # Koha is free software; you can redistribute it and/or modify it under the
 # terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
+# Foundation; either version 3 of the License, or (at your option) any later
 # version.
 #
 # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
@@ -37,8 +30,7 @@ use C4::Output;
 use C4::Auth;
 use C4::Biblio;
 use C4::ImportBatch;
-use XML::LibXSLT;
-use XML::LibXML;
+use C4::XSLT ();
 
 my $input       = new CGI;
 my $biblionumber = $input->param('id');
@@ -54,6 +46,10 @@ 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);
@@ -61,26 +57,20 @@ if ($view eq 'card' || $view eq 'html') {
     my $xslfilename;
     my $htdocs  = C4::Context->config('opachtdocs');
     my $theme   = C4::Context->preference("opacthemes");
-    my $lang = C4::Templates::_current_language();
+    my $lang = C4::Languages::getlanguage($input);
 
     if ($view eq 'card'){
         $xslfile = "compact.xsl";
     }
     else { # must be html
-        $xslfile = C4::Context->preference('marcflavour') . "slim2OPACMARCdetail.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($xslfilename);
-    my $stylesheet = $xslt->parse_stylesheet($style_doc);
-    my $results = $stylesheet->transform($source);
-    my $newxmlrecord = $stylesheet->output_string($results);
+    my $newxmlrecord = C4::XSLT::engine->transform($xmlrecord, $xslfilename);
     print $input->header(-charset => 'UTF-8'), Encode::encode_utf8($newxmlrecord);
 }
 else { #view eq marc