Merge remote-tracking branch 'kc/master' into new/bug_5683

[koha-ffzg.git] / opac / opac-showmarc.pl

diff --git a/opac/opac-showmarc.pl b/opac/opac-showmarc.pl
index b379917..4475512 100755 (executable)
--- a/opac/opac-showmarc.pl
+++ b/opac/opac-showmarc.pl
@@ -48,7 +48,7 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user({
         template_name   => "opac-showmarc.tmpl",
         query           => $input,
         type            => "opac",
-        authnotrequired => 1,
+        authnotrequired => ( C4::Context->preference("OpacPublic") ? 1 : 0 ),
         debug           => 1,
 });
 
@@ -61,19 +61,25 @@ if ($importid) {
                $xmlrecord = $record->as_xml();
        } 
 }
-               
-if ($view eq 'card') {
-$xmlrecord = GetXmlBiblio($biblionumber) unless $xmlrecord;
-my $xslfile = C4::Context->config('opachtdocs')."/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 $input->header(), $newxmlrecord;
+
+
+if ($view eq 'card' || $view eq 'html') {
+    $xmlrecord = GetXmlBiblio($biblionumber) unless $xmlrecord;
+    my $xslfile;
+    if ($view eq 'card'){
+       $xslfile = C4::Context->config('opachtdocs')."/prog/en/xslt/compact.xsl";
+    }
+    else { # must be html
+       $xslfile = C4::Context->config('opachtdocs')."/prog/en/xslt/MARC21slim2OPACMARCdetail.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);
+    print $input->header(), $newxmlrecord;
     exit;
 } else {
     $record =GetMarcBiblio($biblionumber) unless $record;