From ee8b0e7cf3df4b3de078889845ed586e95ed2a56 Mon Sep 17 00:00:00 2001 From: Marcel de Rooy Date: Mon, 22 Aug 2011 14:02:03 +0200 Subject: [PATCH] [SIGNED-OFF] 6747 Checks in opac-export Content-Type: text/plain; charset="utf-8" Added check on returned marc. If record does not exist, generate 404. (Prevents 500 errors by Googlebot on deleted records.) Fixed typo, whitespace. Removed if on op=export. Added check on format. Signed-off-by: Owen Leonard --- opac/opac-export.pl | 105 +++++++++++++++++++++++++-------------------------- 1 files changed, 51 insertions(+), 54 deletions(-) diff --git a/opac/opac-export.pl b/opac/opac-export.pl index e8f7ede..d24ddb2 100755 --- a/opac/opac-export.pl +++ b/opac/opac-export.pl @@ -18,7 +18,6 @@ # Suite 330, Boston, MA 02111-1307 USA # - use strict; use warnings; @@ -31,59 +30,57 @@ use C4::Auth; use C4::Ris; my $query = new CGI; -my $op=$query->param("op"); -my $format=$query->param("format"); -if ($op eq "export") { - my $biblionumber = $query->param("bib"); - my $error; - - if ($biblionumber){ +my $op=$query->param("op")||''; #op=export is currently the only use +my $format=$query->param("format")||'utf8'; +my $biblionumber = $query->param("bib")||0; +my ($marc, $error)= ('',''); - my $marc = GetMarcBiblio($biblionumber, 1); - - 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); +} +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"); + $marc = $marc->as_usmarc() unless $error; +} +elsif ($format =~ /utf8/) { + C4::Charset::SetUTF8Flag($marc,1); + $marc = $marc->as_usmarc(); +} +else { + $error= "Format $format is not supported."; +} - if ($error){ - print $query->header(); - print $query->start_html(); - print "

An error occured

"; - print $error; - print $query->end_html(); - } - else { - print $query->header( - -type => 'application/octet-stream', - -attachment=>"bib-$biblionumber.$format"); - print $marc; - } - } +if ($error){ + print $query->header(); + print $query->start_html(); + print "

An error occurred

"; + print $error; + print $query->end_html(); +} +else { + print $query->header( + -type => 'application/octet-stream', + -attachment=>"bib-$biblionumber.$format"); + print $marc; } -- 1.7.3