X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=opac%2Fopac-showmarc.pl;h=71fb8047973b0c9e38a49ce94204b31d0b593cfe;hb=e191bb02bfda7f17ae8b4f681314c51d2e7e6b92;hp=aec114b333008b239574952b1f9dd3044e3f1c5a;hpb=aef1dd15fbe37a8a9c30ba4b38f7ecd6c1fea54d;p=koha.git

diff --git a/opac/opac-showmarc.pl b/opac/opac-showmarc.pl
index aec114b333..71fb804797 100755
--- a/opac/opac-showmarc.pl
+++ b/opac/opac-showmarc.pl
@@ -27,8 +27,6 @@
 use strict;
 use warnings;
 
-use open OUT=>':utf8', ':std';
-
 # standard or CPAN modules used
 use CGI;
 use Encode;
@@ -44,49 +42,55 @@ use XML::LibXML;
 
 my $input       = new CGI;
 my $biblionumber = $input->param('id');
-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,
-});
+$biblionumber   = int($biblionumber);
+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();
+    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 = C4::Context->preference('marcflavour') . "slim2OPACMARCdetail.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);
-    $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;
 }