Merge remote branch 'kc/master' into new/enh/bug_5579

[koha_fer] / catalogue / export.pl

diff --git a/catalogue/export.pl b/catalogue/export.pl
index 758afd3..9bd49de 100755 (executable)
--- a/catalogue/export.pl
+++ b/catalogue/export.pl
@@ -1,7 +1,8 @@
 #!/usr/bin/perl
 use HTML::Template::Pro;
 use strict;
-require Exporter;
+#use warnings; FIXME - Bug 2505
+
 use C4::Record;
 use C4::Auth;
 use C4::Output;
@@ -14,14 +15,9 @@ my $op=$query->param("op");
 my $format=$query->param("format");
 if ($op eq "export") {
        my $biblionumber = $query->param("bib");
-       my $dbh=C4::Context->dbh;
-       my $sth;
-       if ($biblionumber) {
-               $sth=$dbh->prepare("SELECT marc FROM biblioitems WHERE biblionumber =?");
-               $sth->execute($biblionumber);
-       }
-       while (my ($marc) = $sth->fetchrow) {
-               if ($marc){
+               if ($biblionumber){
+
+                       my $marc = GetMarcBiblio($biblionumber, 1);
 
                        if ($format =~ /endnote/) {
                                $marc = marc2endnote($marc);
@@ -43,12 +39,12 @@ if ($op eq "export") {
                                $marc = $marc->as_usmarc();
                        }
                        elsif ($format =~ /utf8/) {
-                               #default
+                               C4::Charset::SetUTF8Flag($marc, 1);
+                               $marc = $marc->as_usmarc();
                        }
                        print $query->header(
                                -type => 'application/octet-stream',
                 -attachment=>"bib-$biblionumber.$format");
                        print $marc;
                }
-       }
 }