X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=catalogue%2Fshowmarc.pl;h=0ee70c5fea0f6f63ca1914d71bab045860efa1d7;hb=5b6f89714d58d4a7c33b621b2cefbc02523dafa3;hp=d0011ba305b3cdff3d54da61112f78d73c91b48e;hpb=f9299b1a76b7c6195e7abcc689127e78ce26701c;p=koha.git

diff --git a/catalogue/showmarc.pl b/catalogue/showmarc.pl
index d0011ba305..0ee70c5fea 100755
--- a/catalogue/showmarc.pl
+++ b/catalogue/showmarc.pl
@@ -1,13 +1,9 @@
 #!/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
+# Parts copyright 2010 BibLibre
 #
 # This file is part of Koha.
 #
@@ -25,11 +21,12 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 use strict;
-#use warnings; FIXME - Bug 2505
+use warnings;
 
 # standard or CPAN modules used
 use CGI qw(:standard);
 use DBI;
+use Encode;
 
 # Koha modules used
 use C4::Context;
@@ -40,53 +37,48 @@ use C4::ImportBatch;
 use XML::LibXSLT;
 use XML::LibXML;
 
-my $input       = new CGI;
-my $biblionumber = $input->param('id');
-my $importid		=	$input->param('importid');
-my $view		= $input->param('viewas');
+my $input= new CGI;
+my $biblionumber= $input->param('id');
+my $importid= $input->param('importid');
+my $view= $input->param('viewas')||'';
 
-my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
-    {
+my $record;
+if ($importid) {
+    my ($marc) = GetImportRecordMarc($importid);
+    $record = MARC::Record->new_from_usmarc($marc);
+}
+else {
+    $record =GetMarcBiblio($biblionumber);
+}
+
+if($view eq 'card') {
+    my $themelang =  '/' . C4::Templates::_current_language();
+    my $xmlrecord= $importid? $record->as_xml(): GetXmlBiblio($biblionumber);
+    my $xslfile =
+      C4::Context->config('intrahtdocs') . '/prog' . $themelang . "/xslt/compact.xsl";
+    if ( ! -f $xslfile && $themelang ne '/en' ) {
+        $xslfile=~s#$themelang#/en#;
+    }
+    my $parser       = XML::LibXML->new();
+    my $xslt         = XML::LibXSLT->new();
+    my $source       = $parser->parse_string($xmlrecord);
+    my $style_doc    = $parser->parse_file($xslfile);
+    my $stylesheet   = $xslt->parse_stylesheet($style_doc);
+    my $results      = $stylesheet->transform($source);
+    my $newxmlrecord = $stylesheet->output_string($results);
+    print $input->header(-charset => 'UTF-8'), Encode::encode_utf8($newxmlrecord);
+}
+else {
+    my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
+      {
         template_name   => "catalogue/showmarc.tmpl",
         query           => $input,
         type            => "intranet",
         authnotrequired => 0,
         flagsrequired   => { catalogue => 1  },
         debug           => 1,
-    }
-);
-
-$template->param( SCRIPT_NAME => $ENV{'SCRIPT_NAME'}, );
-my ($record, $xmlrecord);
-if($importid) {
-	my ($marc,$encoding) = GetImportRecordMarc($importid);
-		$record = MARC::Record->new_from_usmarc($marc) ;
- 	if($view eq 'card') {
-		$xmlrecord = $record->as_xml();
-	} 
-}
-		
-if($view eq 'card') {
-$xmlrecord = GetXmlBiblio($biblionumber) unless $xmlrecord;
-
-my $xslfile = C4::Context->config('intrahtdocs')."/prog/en/xslt/compact.xsl";
-my $parser = XML::LibXML->new();
-my $xslt = XML::LibXSLT->new();
-my $source = $parser->parse_string($xmlrecord);
-my $style_doc = $parser->parse_file($xslfile);
-my $stylesheet = $xslt->parse_stylesheet($style_doc);
-my $results = $stylesheet->transform($source);
-my $newxmlrecord = $stylesheet->output_string($results);
-#warn $newxmlrecord;
-print "Content-type: text/html\n\n";
-print $newxmlrecord;
-
-} else {
-
-$record =GetMarcBiblio($biblionumber) unless $record; 
-
-my $formatted = $record->as_formatted;
-$template->param( MARC_FORMATTED => $formatted );
-
-output_html_with_http_headers $input, $cookie, $template->output;
+      }
+    );
+    $template->param( MARC_FORMATTED => $record->as_formatted );
+    output_html_with_http_headers $input, $cookie, $template->output;
 }