- if ($format =~ /endnote/) {
- $marc = marc2endnote($marc);
- $format = 'endnote';
- }
- elsif ($format =~ /marcxml/) {
- $marc = marc2marcxml($marc);
- }
- elsif ($format=~ /mods/) {
- $marc = marc2modsxml($marc);
- }
- elsif ($format =~ /ris/) {
- $marc = marc2ris(MARC::Record->new_from_usmarc($marc));
- }
- elsif ($format =~ /bibtex/) {
- $marc = marc2bibtex(C4::Biblio::GetMarcBiblio($biblionumber),$biblionumber);
- }
- elsif ($format =~ /dc/) {
- ($error,$marc) = marc2dcxml($marc,1);
- $format = "dublin-core.xml";
- }
- elsif ($format =~ /marc8/) {
- ($error,$marc) = changeEncoding($marc,"MARC","MARC21","MARC-8");
- if (! $error){
- $marc = $marc->as_usmarc();
- }
- }
- elsif ($format =~ /utf8/) {
- C4::Charset::SetUTF8Flag($marc,1);
- $marc = $marc->as_usmarc();
- }
+$marc = GetMarcBiblio($biblionumber, 1) if $biblionumber;
+if(!$marc) {
+ print $query->redirect("/cgi-bin/koha/errors/404.pl");
+ exit;
+}
+elsif ($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(C4::Biblio::GetMarcBiblio($biblionumber),$biblionumber);
+ $format = 'bibtex';
+}
+elsif ($format =~ /dc/) {
+ ($error,$marc) = marc2dcxml($marc,1);
+ $format = "dublin-core.xml";
+}
+elsif ($format =~ /marc8/) {
+ ($error,$marc) = changeEncoding($marc,"MARC","MARC21","MARC-8");
+ $marc = $marc->as_usmarc() unless $error;
+ $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';
+}
+else {
+ $error= "Format $format is not supported.";
+}