X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=opac%2Fopac-showmarc.pl;h=57c63fede1091bb30d54b14c5e82c7626908de92;hb=59df6a114ec7e75198e115b14050d1b46228d598;hp=702fb1b17841535fd302d99d296db4e00b714cd5;hpb=afd2418d7387dc2a50835128e24840686600ef4b;p=srvgit

diff --git a/opac/opac-showmarc.pl b/opac/opac-showmarc.pl
index 702fb1b178..57c63fede1 100755
--- a/opac/opac-showmarc.pl
+++ b/opac/opac-showmarc.pl
@@ -4,83 +4,87 @@
 #
 # 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 3 of the License, or (at your option) any later
-# version.
+# 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 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
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+# Koha is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License along
-# with Koha; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# You should have received a copy of the GNU General Public License
+# along with Koha; if not, see <http://www.gnu.org/licenses>.
 
-use strict;
-use warnings;
+use Modern::Perl;
 
 # standard or CPAN modules used
-use CGI;
+use CGI qw ( -utf8 );
 use Encode;
 
 # Koha modules used
 use C4::Context;
-use C4::Output;
-use C4::Auth;
-use C4::Biblio;
+use C4::Output qw( output_html_with_http_headers );
+use C4::Auth qw( get_template_and_user );
 use C4::ImportBatch;
-use C4::XSLT ();
+use C4::XSLT;
+use C4::Templates;
+use Koha::RecordProcessor;
+
+my $input       = CGI->new;
+my ( $template, $loggedinuser, $cookie ) = get_template_and_user({
+    template_name   => "opac-showmarc.tt",
+    query           => $input,
+    type            => "opac",
+    authnotrequired => ( C4::Context->preference("OpacPublic") ? 1 : 0 ),
+});
 
-my $input       = new CGI;
 my $biblionumber = $input->param('id');
-$biblionumber   = int($biblionumber);
-my $importid= $input->param('importid');
-my $view= $input->param('viewas') || 'marc';
 
-my $record;
-if ($importid) {
-    my ($marc) = GetImportRecordMarc($importid);
-    $record = MARC::Record->new_from_usmarc($marc);
+unless ( $biblionumber ) {
+    print $input->redirect("/cgi-bin/koha/errors/400.pl");
+    exit;
 }
-else {
-    $record =GetMarcBiblio($biblionumber);
+
+my $biblio;
+$biblio = Koha::Biblios->find( $biblionumber, { prefetch => [ 'metadata' ] } );
+
+unless ( $biblio ) {
+    print $input->redirect('/cgi-bin/koha/errors/404.pl');
+    exit;
 }
+
+my $view= $input->param('viewas') || 'marc';
+
+my $record_processor = Koha::RecordProcessor->new(
+    {
+        filters => 'ViewPolicy',
+        options => {
+            interface     => 'opac',
+            frameworkcode => $biblio->frameworkcode
+        }
+    }
+);
+
+my $record = $biblio->metadata->record;
+
 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);
-    my $xslfile;
-    my $xslfilename;
-    my $htdocs  = C4::Context->config('opachtdocs');
-    my $theme   = C4::Context->preference("opacthemes");
-    my $lang = C4::Languages::getlanguage($input);
-
-    if ($view eq 'card'){
-        $xslfile = "compact.xsl";
-    }
-    else { # must be html
-        $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 );
+$record_processor->process($record);
 
-    my $newxmlrecord = C4::XSLT::engine->transform($xmlrecord, $xslfilename);
-    print $input->header(-charset => 'UTF-8'), Encode::encode_utf8($newxmlrecord);
+if ($view eq 'card' || $view eq 'html') {
+    my $xml = $record->as_xml;
+    my $xsl = $view eq 'card' ? 'compact.xsl' : 'plainMARC.xsl';
+    my $htdocs = C4::Context->config('opachtdocs');
+    my ($theme, $lang) = C4::Templates::themelanguage($htdocs, $xsl, 'opac', $input);
+    $xsl = "$htdocs/$theme/$lang/xslt/$xsl";
+    output_html_with_http_headers $input, undef, Encode::encode_utf8(C4::XSLT::engine->transform($xml, $xsl));
 }
 else { #view eq marc
-    my ( $template, $loggedinuser, $cookie ) = get_template_and_user({
-        template_name   => "opac-showmarc.tt",
-        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;
 }