Merge remote-tracking branch 'kc/new/bug_5616' into kcmaster

[koha.git] / catalogue / showmarc.pl

diff --git a/catalogue/showmarc.pl b/catalogue/showmarc.pl
index 4b959fe..5e03798 100755 (executable)
--- a/catalogue/showmarc.pl
+++ b/catalogue/showmarc.pl
@@ -1,13 +1,11 @@
 #!/usr/bin/perl
 
-# $Id: showmarc.pl,v 1.1.2.1 2007/06/18 21:57:23 rangi Exp $
-
-
-# Koha library project  www.koha.org
+# Koha library project  www.koha-community.org
 
 # Licensed under the GPL
 
 # Copyright 2007 Liblime
+# Parts copyright 2010 BibLibre
 #
 # This file is part of Koha.
 #
@@ -20,28 +18,32 @@
 # 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., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
+# 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.
 
 use strict;
+#use warnings; FIXME - Bug 2505
+
+use open OUT=>':utf8', ':std';
 
 # standard or CPAN modules used
 use CGI qw(:standard);
 use DBI;
+use Encode;
 
 # Koha modules used
 use C4::Context;
 use C4::Output;
 use C4::Auth;
 use C4::Biblio;
+use C4::ImportBatch;
 use XML::LibXSLT;
 use XML::LibXML;
 
-my $userid = $ENV{'REMOTE_USER'};
-
 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(
@@ -50,16 +52,25 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         query           => $input,
         type            => "intranet",
         authnotrequired => 0,
-        flagsrequired   => { acquisition => 1  },
+        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') {
-my $xmlrecord = GetXmlBiblio($biblionumber);
+$xmlrecord = GetXmlBiblio($biblionumber) unless $xmlrecord;
 
-my $xslfile = C4::Context->config('intranetdir')."/koha-tmpl/intranet-tmpl/prog/en/xslt/compact.xsl";
+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);
@@ -67,16 +78,17 @@ 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;
+$newxmlrecord=Encode::decode_utf8($newxmlrecord) unless utf8::is_utf8($newxmlrecord); #decode only if not in perl internal format
+print $input->header(-charset => 'UTF-8'), $newxmlrecord;
 
 } else {
 
-my $record =GetMarcBiblio($biblionumber); 
+$record =GetMarcBiblio($biblionumber) unless $record; 
 
 my $formatted = $record->as_formatted;
 $template->param( MARC_FORMATTED => $formatted );
 
-output_html_with_http_headers $input, $cookie, $template->output;
+my $output= $template->output;
+$output=Encode::decode_utf8($output) unless utf8::is_utf8($output);
+output_html_with_http_headers $input, $cookie, $output;
 }