Bug 16951: Replace some more

[koha.git] / catalogue / showmarc.pl

diff --git a/catalogue/showmarc.pl b/catalogue/showmarc.pl
index 2c690fc..a48a852 100755 (executable)
--- a/catalogue/showmarc.pl
+++ b/catalogue/showmarc.pl
@@ -24,7 +24,7 @@ use strict;
 use warnings;
 
 # standard or CPAN modules used
-use CGI qw(:standard);
+use CGI qw(:standard -utf8);
 use DBI;
 use Encode;
 
@@ -43,8 +43,7 @@ my $view= $input->param('viewas')||'';
 
 my $record;
 if ($importid) {
-    my ($marc) = GetImportRecordMarc($importid);
-    $record = MARC::Record->new_from_usmarc($marc);
+    $record = C4::ImportBatch::GetRecordFromImportBiblio( $importid, 'embed_items' );
 }
 else {
     $record =GetMarcBiblio($biblionumber);
@@ -54,16 +53,21 @@ if(!ref $record) {
     exit;
 }
 
-if($view eq 'card') {
-    my $themelang =  '/' . C4::Languages::getlanguage($input);
-    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#;
+if($view eq 'card' || $view eq 'html') {
+    my $xml = $importid ? $record->as_xml(): GetXmlBiblio($biblionumber);
+    my $xsl;
+    if ( $view eq 'card' ){
+        $xsl = C4::Context->preference('marcflavour') eq 'UNIMARC'
+              ? 'UNIMARC_compact.xsl' : 'compact.xsl';
     }
-    my $newxmlrecord = C4::XSLT::engine->transform($xmlrecord, $xslfile);
-    print $input->header(-charset => 'UTF-8'), Encode::encode_utf8($newxmlrecord);
+    else {
+        $xsl = 'plainMARC.xsl';
+    }
+    my $htdocs = C4::Context->config('intrahtdocs');
+    my ($theme, $lang) = C4::Templates::themelanguage($htdocs, $xsl, 'intranet', $input);
+    $xsl = "$htdocs/$theme/$lang/xslt/$xsl";
+    print $input->header(-charset => 'UTF-8'),
+          Encode::encode_utf8(C4::XSLT::engine->transform($xml, $xsl));
 }
 else {
     my ( $template, $loggedinuser, $cookie ) = get_template_and_user(