Bug 30262: Trim whitespace off tracklinks.pl URLs

[srvgit] / catalogue / showmarc.pl

diff --git a/catalogue/showmarc.pl b/catalogue/showmarc.pl
index 1954ce8..74bb20d 100755 (executable)
--- a/catalogue/showmarc.pl
+++ b/catalogue/showmarc.pl
@@ -7,47 +7,67 @@
 #
 # 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 qw(:standard);
-use DBI;
+use CGI qw(:standard -utf8);
 use Encode;
 
 # Koha modules used
 use C4::Context;
-use C4::Output;
-use C4::Auth;
-use C4::Biblio;
-use C4::ImportBatch;
-use C4::XSLT ();
+use C4::Output qw( output_html_with_http_headers );
+use C4::Auth qw( get_template_and_user );
+use C4::Biblio qw( GetXmlBiblio );
+use C4::XSLT;
+
+use Koha::Biblios;
+use Koha::Import::Records;
+
+my $input= CGI->new;
+my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
+  {
+    template_name   => "catalogue/showmarc.tt",
+    query           => $input,
+    type            => "intranet",
+    flagsrequired   => { catalogue => 1  },
+  }
+);
 
-my $input= new CGI;
 my $biblionumber= $input->param('id');
 my $importid= $input->param('importid');
 my $view= $input->param('viewas')||'';
 
+my $marcflavour = C4::Context->preference('marcflavour');
+
 my $record;
+my $record_type = 'biblio';
+my $format = $marcflavour eq 'UNIMARC' ? 'UNIMARC' : 'USMARC';
 if ($importid) {
-    my ($marc) = GetImportRecordMarc($importid);
-    $record = MARC::Record->new_from_usmarc($marc);
+    my $import_record = Koha::Import::Records->find($importid);
+    if ($import_record) {
+        if ($marcflavour eq 'UNIMARC' && $import_record->record_type eq 'auth') {
+            $format = 'UNIMARCAUTH';
+        }
+
+        $record = $import_record->get_marc_record();
+    }
 }
 else {
-    $record =GetMarcBiblio($biblionumber);
+    my $biblio = Koha::Biblios->find($biblionumber);
+    $record = $biblio->metadata->record;
 }
 if(!ref $record) {
     print $input->redirect("/cgi-bin/koha/errors/404.pl");
@@ -55,11 +75,10 @@ if(!ref $record) {
 }
 
 if($view eq 'card' || $view eq 'html') {
-    my $xml = $importid ? $record->as_xml(): GetXmlBiblio($biblionumber);
+    my $xml = $importid ? $record->as_xml($format): GetXmlBiblio($biblionumber);
     my $xsl;
     if ( $view eq 'card' ){
-        $xsl = C4::Context->preference('marcflavour') eq 'UNIMARC'
-              ? 'UNIMARC_compact.xsl' : 'compact.xsl';
+        $xsl = $marcflavour eq 'UNIMARC' ? 'UNIMARC_compact.xsl' : 'compact.xsl';
     }
     else {
         $xsl = 'plainMARC.xsl';
@@ -71,16 +90,6 @@ if($view eq 'card' || $view eq 'html') {
           Encode::encode_utf8(C4::XSLT::engine->transform($xml, $xsl));
 }
 else {
-    my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
-      {
-        template_name   => "catalogue/showmarc.tt",
-        query           => $input,
-        type            => "intranet",
-        authnotrequired => 0,
-        flagsrequired   => { catalogue => 1  },
-        debug           => 1,
-      }
-    );
     $template->param( MARC_FORMATTED => $record->as_formatted );
     output_html_with_http_headers $input, $cookie, $template->output;
 }