Merge remote-tracking branch 'origin/new/bug_7751'

[koha.git] / catalogue / export.pl

diff --git a/catalogue/export.pl b/catalogue/export.pl
index 2b55d9f..3a76084 100755 (executable)
--- a/catalogue/export.pl
+++ b/catalogue/export.pl
@@ -22,6 +22,7 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user({
 
 my $op=$query->param("op");
 my $format=$query->param("format");
+my $error = '';
 if ($op eq "export") {
        my $biblionumber = $query->param("bib");
                if ($biblionumber){
@@ -39,7 +40,6 @@ if ($op eq "export") {
                                $marc = marc2modsxml($marc);
                        }
                        elsif ($format =~ /dc/) {
-                               my $error;
                                ($error,$marc) = marc2dcxml($marc,1);
                                $format = "dublin-core.xml";
                        }
@@ -51,6 +51,10 @@ if ($op eq "export") {
                                C4::Charset::SetUTF8Flag($marc, 1);
                                $marc = $marc->as_usmarc();
                        }
+            elsif ($format =~ /marcstd/) {
+                C4::Charset::SetUTF8Flag($marc,1);
+                ($error, $marc) = marc2marc($marc, 'marcstd', C4::Context->preference('marcflavour'));
+            }
                        print $query->header(
                                -type => 'application/octet-stream',
                 -attachment=>"bib-$biblionumber.$format");