Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

6747 Checks in opac-export

Browse source 
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 <oleonard@myacpl.org>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
This commit is contained in:
Marcel de Rooy 2011-08-22 14:02:03 +02:00 committed by Chris Cormack
parent 7192572496
commit 223156ea74
1 changed files with 52 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
opac/opac-export.pl
View file

@ -18,7 +18,6 @@
# Suite 330, Boston, MA 02111-1307 USA # Suite 330, Boston, MA 02111-1307 USA
# #
use strict; use strict;
use warnings; use warnings;
@ -31,19 +30,18 @@ use C4::Auth;
use C4::Ris; use C4::Ris;
my $query = new CGI; my $query = new CGI;
my $op=$query->param("op"); my $op=$query->param("op")||''; #op=export is currently the only use
my $format=$query->param("format"); my $format=$query->param("format")||'utf8';
if ($op eq "export") { my $biblionumber = $query->param("bib")||0;
my $biblionumber = $query->param("bib"); my ($marc, $error)= ('','');
my $error;
if ($biblionumber){ $marc = GetMarcBiblio($biblionumber, 1) if $biblionumber;
if(!$marc) {
my $marc = GetMarcBiblio($biblionumber, 1); print $query->redirect("/cgi-bin/koha/errors/404.pl");
exit;
if ($format =~ /endnote/) { }
elsif ($format =~ /endnote/) {
$marc = marc2endnote($marc); $marc = marc2endnote($marc);
$format = 'endnote';
} }
elsif ($format =~ /marcxml/) { elsif ($format =~ /marcxml/) {
$marc = marc2marcxml($marc); $marc = marc2marcxml($marc);
@ -63,19 +61,20 @@ if ($op eq "export") {
} }
elsif ($format =~ /marc8/) { elsif ($format =~ /marc8/) {
($error,$marc) = changeEncoding($marc,"MARC","MARC21","MARC-8"); ($error,$marc) = changeEncoding($marc,"MARC","MARC21","MARC-8");
if (! $error){ $marc = $marc->as_usmarc() unless $error;
$marc = $marc->as_usmarc();
}
} }
elsif ($format =~ /utf8/) { elsif ($format =~ /utf8/) {
C4::Charset::SetUTF8Flag($marc,1); C4::Charset::SetUTF8Flag($marc,1);
$marc = $marc->as_usmarc(); $marc = $marc->as_usmarc();
} }
else {
$error= "Format $format is not supported.";
}
if ($error){ if ($error){
print $query->header(); print $query->header();
print $query->start_html(); print $query->start_html();
print "<h1>An error occured </h1>"; print "<h1>An error occurred </h1>";
print $error; print $error;
print $query->end_html(); print $query->end_html();
} }
@ -85,5 +84,3 @@ if ($op eq "export") {
-attachment=>"bib-$biblionumber.$format"); -attachment=>"bib-$biblionumber.$format");
print $marc; print $marc;
} }
}
}