Bugzilla – Attachment 3656 Details for
Bug 6040
opac-export.pl can throw an untrapped error when trying to export an invalid record
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Signoff
0001-Bug-6040-Adding-some-error-handling-to-the-opac-expo.patch (text/plain), 2.82 KB, created by
Matthias Meusburger
on 2011-04-05 09:33:36 UTC
(
hide
)
Description:
Signoff
Filename:
MIME Type:
Creator:
Matthias Meusburger
Created:
2011-04-05 09:33:36 UTC
Size:
2.82 KB
patch
obsolete
>From 19b9e61ad59de355979d8244ff3e888d535ecdc7 Mon Sep 17 00:00:00 2001 >From: Chris Cormack <chrisc@catalyst.net.nz> >Date: Mon, 4 Apr 2011 15:09:43 +1200 >Subject: [PATCH] [SIGNED-OFF] Bug 6040 : Adding some error handling to the opac export > > >Signed-off-by: Matthias Meusburger <matthias.meusburger@biblibre.com> >--- > opac/opac-export.pl | 44 +++++++++++++++++++++++++++++++++++++------- > 1 files changed, 37 insertions(+), 7 deletions(-) > >diff --git a/opac/opac-export.pl b/opac/opac-export.pl >index 4c53aff..f9d3c25 100755 >--- a/opac/opac-export.pl >+++ b/opac/opac-export.pl >@@ -1,5 +1,24 @@ > #!/usr/bin/perl >-use HTML::Template::Pro; >+ >+# Parts Copyright Catalyst IT 2011 >+# >+# This file is part of Koha. >+# >+# Koha is free software; you can redistribute it and/or modify it under the >+# terms of the GNU General Public License as published by the Free Software >+# Foundation; either version 2 of the License, or (at your option) any later >+# version. >+# >+# Koha is distributed in the hope that it will be useful, but WITHOUT ANY >+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR >+# A PARTICULAR PURPOSE. See the GNU General Public License for more details. >+# >+# You should have received a copy of the GNU General Public License along with >+# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place, >+# Suite 330, Boston, MA 02111-1307 USA >+# >+ >+ > use strict; > use warnings; > >@@ -22,6 +41,7 @@ if ($op eq "export") { > $sth=$dbh->prepare("SELECT marc FROM biblioitems WHERE biblionumber =?"); > $sth->execute($biblionumber); > } >+ my $error; > while (my ($marc) = $sth->fetchrow) { > if ($marc){ > >@@ -41,21 +61,31 @@ if ($op eq "export") { > elsif ($format =~ /bibtex/) { > $marc = marc2bibtex(C4::Biblio::GetMarcBiblio($biblionumber),$biblionumber); > }elsif ($format =~ /dc/) { >- my $error; >- ($error,$marc) = marc2dcxml($marc,1); >+ ($error,$marc) = marc2dcxml($marc,1); > $format = "dublin-core.xml"; > } > elsif ($format =~ /marc8/) { >- $marc = changeEncoding($marc,"MARC","MARC21","MARC-8"); >- $marc = $marc->as_usmarc(); >+ ($error,$marc) = changeEncoding($marc,"MARC","MARC21","MARC-8"); >+ if (! $error){ >+ $marc = $marc->as_usmarc(); >+ } > } > elsif ($format =~ /utf8/) { > #default > } >- print $query->header( >+ if ($error){ >+ print $query->header(); >+ print $query->start_html(); >+ print "<h1>An error occured </h1>"; >+ print $error; >+ print $query->end_html(); >+ } >+ else { >+ print $query->header( > -type => 'application/octet-stream', > -attachment=>"bib-$biblionumber.$format"); >- print $marc; >+ print $marc; >+ } > } > } > } >-- >1.7.1 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 6040
: 3656