X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=catalogue%2Fexport.pl;h=26e189b2bba55d573fe945f7d6bbae9366cd3d46;hb=a90a72c62dcfcbb1989d5ea60a80f51bcee8a23d;hp=2b55d9ffd4ea310fd4971a8fec4b5cdaba76dc89;hpb=c0234dd9b9649063acf2617fecf5c6efda38a532;p=koha.git

diff --git a/catalogue/export.pl b/catalogue/export.pl
index 2b55d9ffd4..26e189b2bb 100755
--- a/catalogue/export.pl
+++ b/catalogue/export.pl
@@ -12,16 +12,17 @@ use CGI;
 
 my $query = new CGI;
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user({
-                                                                     template_name   => "tools/export.tt",
-                                                                     query           => $query,
-                                                                     type            => "intranet",
-                                                                     authnotrequired => 0,
-                                                                     flagsrequired   => { tools => 'export_catalog' },
-                                                                     debug           => 1,
-                                                                     });
+    template_name   => "tools/export.tt",
+    query           => $query,
+    type            => "intranet",
+    authnotrequired => 0,
+    flagsrequired   => { catalogue => 1 },
+    debug           => 1,
+    });
 
 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");