X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=catalogue%2Fexport.pl;h=3a760844d7b00e39665d10a2465e42f690b80410;hb=37f3807442ce1136a57e6fec76648994ada7a5cb;hp=758afd3fa736dd27095cdce3d800576b6168b8d5;hpb=a502aa1c76029927d1c3403b2430c86d75acf7c0;p=koha.git

diff --git a/catalogue/export.pl b/catalogue/export.pl
index 758afd3fa7..3a760844d7 100755
--- a/catalogue/export.pl
+++ b/catalogue/export.pl
@@ -1,27 +1,33 @@
 #!/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;
 use C4::Biblio;
 use CGI;
-use C4::Auth;
+
+
 
 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,
+                                                                     });
+
 my $op=$query->param("op");
 my $format=$query->param("format");
+my $error = '';
 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);
@@ -34,7 +40,6 @@ if ($op eq "export") {
 				$marc = marc2modsxml($marc);
 			}
 			elsif ($format =~ /dc/) {
-				my $error;
 				($error,$marc) = marc2dcxml($marc,1);
 				$format = "dublin-core.xml";
 			}
@@ -43,12 +48,16 @@ if ($op eq "export") {
 				$marc = $marc->as_usmarc();
 			}
 			elsif ($format =~ /utf8/) {
-				#default
+				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");
 			print $marc;
 		}
-	}
 }