[Koha-patches] [PATCH] fix warning in C4::AuthoritiesMarc::merge()
Galen Charlton
galen.charlton at liblime.com
Sun Apr 26 16:48:42 CEST 2009
"my" variable @X masks earlier declaration in same scope at C4/AuthoritiesMarc.pm line 1200
---
C4/AuthoritiesMarc.pm | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/C4/AuthoritiesMarc.pm b/C4/AuthoritiesMarc.pm
index 2b792b5..633ced8 100644
--- a/C4/AuthoritiesMarc.pm
+++ b/C4/AuthoritiesMarc.pm
@@ -1195,10 +1195,8 @@ sub merge {
my $authtypecodeto = GetAuthTypeCode($mergeto);
# warn "mergefrom : $authtypecodefrom $mergefrom mergeto : $authtypecodeto $mergeto ";
# return if authority does not exist
- my @X = $MARCfrom->fields();
- return "error MARCFROM not a marcrecord ".Data::Dumper::Dumper($MARCfrom) if $#X == -1;
- my @X = $MARCto->fields();
- return "error MARCTO not a marcrecord".Data::Dumper::Dumper($MARCto) if $#X == -1;
+ return "error MARCFROM not a marcrecord ".Data::Dumper::Dumper($MARCfrom) if scalar($MARCfrom->fields()) == 0;
+ return "error MARCTO not a marcrecord".Data::Dumper::Dumper($MARCto) if scalar($MARCto->fields()) == 0;
# search the tag to report
my $sth = $dbh->prepare("select auth_tag_to_report from auth_types where authtypecode=?");
$sth->execute($authtypecodefrom);
--
1.5.6.5
More information about the Koha-patches
mailing list