X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;ds=sidebyside;f=catalogue%2Fexport.pl;h=c10686c12b34be8695ecf45724c6b817bec8c095;hb=ecc6b8b61532afdfaed7436a76d32369b48ba306;hp=9bd49dec4799fb90cfb15170e7c0744f75744069;hpb=700249eb3cbf765a5a731effd21ba543b74eb334;p=koha.git

diff --git a/catalogue/export.pl b/catalogue/export.pl
index 9bd49dec47..c10686c12b 100755
--- a/catalogue/export.pl
+++ b/catalogue/export.pl
@@ -1,5 +1,4 @@
 #!/usr/bin/perl
-use HTML::Template::Pro;
 use strict;
 #use warnings; FIXME - Bug 2505
 
@@ -7,44 +6,77 @@ use C4::Record;
 use C4::Auth;
 use C4::Output;
 use C4::Biblio;
-use CGI;
-use C4::Auth;
+use CGI qw ( -utf8 );
+use C4::Ris;
+
+
 
 my $query = new CGI;
+my ( $template, $loggedinuser, $cookie ) = get_template_and_user({
+    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){
+    my $biblionumber = $query->param("bib");
+        if ($biblionumber){
 
-			my $marc = GetMarcBiblio($biblionumber, 1);
+            my $marc = GetMarcBiblio({
+                biblionumber => $biblionumber,
+                embed_items  => 1 });
 
-			if ($format =~ /endnote/) {
-				$marc = marc2endnote($marc);
-				$format = 'endnote';
-			}
-			elsif ($format =~ /marcxml/) {
-				$marc = marc2marcxml($marc);
-			}
-			elsif ($format=~ /mods/) {
-				$marc = marc2modsxml($marc);
-			}
-			elsif ($format =~ /dc/) {
-				my $error;
-				($error,$marc) = marc2dcxml($marc,1);
-				$format = "dublin-core.xml";
-			}
-			elsif ($format =~ /marc8/) {
-				$marc = changeEncoding($marc,"MARC","MARC21","MARC-8");
-				$marc = $marc->as_usmarc();
-			}
-			elsif ($format =~ /utf8/) {
-				C4::Charset::SetUTF8Flag($marc, 1);
-				$marc = $marc->as_usmarc();
-			}
-			print $query->header(
-				-type => 'application/octet-stream',
+            if ($format =~ /endnote/) {
+                $marc = marc2endnote($marc);
+                $format = 'endnote';
+            }
+            elsif ($format =~ /marcxml/) {
+                $marc = marc2marcxml($marc);
+                $format = "marcxml";
+            }
+            elsif ($format=~ /mods/) {
+                $marc = marc2modsxml($marc);
+                $format = "mods";
+            }
+            elsif ($format =~ /ris/) {
+                $marc = marc2ris($marc);
+                $format = "ris";
+            }
+            elsif ($format =~ /bibtex/) {
+                $marc = marc2bibtex($marc);
+                $format = "bibtex";
+            }
+            elsif ($format =~ /dc$/) {
+                $marc = marc2dcxml(undef, undef, $biblionumber, $format);
+                $format = "dublin-core.xml";
+            }
+            elsif ($format =~ /marc8/) {
+                $marc = changeEncoding($marc,"MARC","MARC21","MARC-8");
+                $marc = $marc->as_usmarc();
+                $format = "marc8";
+            }
+            elsif ($format =~ /utf8/) {
+                C4::Charset::SetUTF8Flag($marc, 1);
+                $marc = $marc->as_usmarc();
+                $format = "utf8";
+            }
+            elsif ($format =~ /marcstd/) {
+                C4::Charset::SetUTF8Flag($marc,1);
+                ($error, $marc) = marc2marc($marc, 'marcstd', C4::Context->preference('marcflavour'));
+                $format = "marcstd";
+            }
+            if ( $format =~ /utf8/ or $format =~ /marcstd/ ) {
+                binmode STDOUT, ':encoding(UTF-8)';
+            }
+            print $query->header(
+                -type => 'application/octet-stream',
                 -attachment=>"bib-$biblionumber.$format");
-			print $marc;
-		}
+            print $marc;
+        }
 }