X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXUser.pm;h=690a8ae4d99b2aaf1fe97c52fa82d7cb05de114f;hb=d80e548735a53ddf74561e54956ddf94116608d0;hp=84a569497171c9a0cc1584333130e59e8cc321ed;hpb=0e8259381a4d4f4ea9059cdabc0cc4c88e637a99;p=spider.git diff --git a/perl/DXUser.pm b/perl/DXUser.pm index 84a56949..690a8ae4 100644 --- a/perl/DXUser.pm +++ b/perl/DXUser.pm @@ -20,7 +20,7 @@ use strict; use vars qw($VERSION $BRANCH); $VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ ); -$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ ) || 0; +$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ || (0,0)); $main::build += $VERSION; $main::branch += $BRANCH; @@ -400,8 +400,9 @@ print "There are $count user records and $err errors\n"; for ($action = R_FIRST; !$dbm->seq($key, $val, $action); $action = R_NEXT) { if (!is_callsign($key) || $key =~ /^0/) { - Log('DXCommand', "Export Error: $key\t$val"); - $dbm->del($key); + Log('DXCommand', "Export Error1: $key\t$val"); + eval {$dbm->del($key)}; + dbg(carp("Export Error1: $key\t$val\n$@")) if $@; ++$err; next; } @@ -410,8 +411,9 @@ print "There are $count user records and $err errors\n"; print $fh "$key\t" . $ref->encode . "\n"; ++$count; } else { - Log('DXCommand', "Export Error: $key\t$val"); - $dbm->del($key); + Log('DXCommand', "Export Error2: $key\t$val"); + eval {$dbm->del($key)}; + dbg(carp("Export Error2: $key\t$val\n$@")) if $@; ++$err; } }