From 505087abc4eac54a2c91bbcde7c572dd452df669 Mon Sep 17 00:00:00 2001 From: Chris Catalfo Date: Tue, 12 May 2009 00:35:13 +0000 Subject: [PATCH] Bug 1907 partial fix: prevent warnings on undefined params. This patch adds default blank values for a couple of params the script might receive which were producing warns in the error log. Also wraps GetMarcBiblio in an eval. Signed-off-by: Galen Charlton --- tools/export.pl | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/tools/export.pl b/tools/export.pl index 0a3eeacb0b..d31210cbd1 100755 --- a/tools/export.pl +++ b/tools/export.pl @@ -27,7 +27,7 @@ use C4::Koha; # GetItemTypes use C4::Branch; # GetBranches my $query = new CGI; -my $op=$query->param("op"); +my $op=$query->param("op") || ''; my $filename=$query->param("filename"); my $dbh=C4::Context->dbh; my $marcflavour = C4::Context->preference("marcflavour"); @@ -50,7 +50,11 @@ my ($template, $loggedinuser, $cookie) C4::Context->userenv->{flags} !=1 && C4::Context->userenv->{branch}?1:0); my $branches = GetBranches($limit_ind_branch); - my $branch = $query->param("branch"); + my $branch = $query->param("branch") || ''; + if ( C4::Context->preference("IndependantBranches") ) { + $branch = C4::Context->userenv->{'branch'}; + } + if ($op eq "export") { binmode(STDOUT,":utf8"); @@ -125,7 +129,11 @@ if ($op eq "export") { $sth->execute(@sql_params); while (my ($biblionumber) = $sth->fetchrow) { - my $record = GetMarcBiblio($biblionumber); + my $record = eval{ GetMarcBiblio($biblionumber); }; + # FIXME: decide how to handle records GetMarcBiblio can't parse or retrieve + if ($@) { + next; + } next if not defined $record; if ( $dont_export_items || $strip_nonlocal_items || $limit_ind_branch) { my ( $homebranchfield, $homebranchsubfield ) = -- 2.39.5