projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add standard gcommit command
[spider.git]
/
perl
/
Prefix.pm
diff --git
a/perl/Prefix.pm
b/perl/Prefix.pm
index bc8a0edf92ea3f411b6e2f242fe6eef824a228ad..2572cb8794f5a2b801ab97d904fd30cadcc4309f 100644
(file)
--- a/
perl/Prefix.pm
+++ b/
perl/Prefix.pm
@@
-19,12
+19,6
@@
use LRU;
use strict;
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,0));
-$main::build += $VERSION;
-$main::branch += $BRANCH;
-
use vars qw($db %prefix_loc %pre $lru $lrusize $misses $hits $matchtotal);
$db = undef; # the DB_File handle
use vars qw($db %prefix_loc %pre $lru $lrusize $misses $hits $matchtotal);
$db = undef; # the DB_File handle
@@
-76,10
+70,10
@@
sub load
}
# tie the main prefix database
}
# tie the main prefix database
- $db = tie(%pre, "DB_File", undef, O_RDWR|O_CREAT, 0664, $DB_BTREE) or confess "can't tie \%pre ($!)";
- my $out =
$@ if $@
;
-
do "$main::data/prefix_data.pl" if !$out
;
- $out = $@ if $@;
+ eval {$db = tie(%pre, "DB_File", undef, O_RDWR|O_CREAT, 0664, $DB_BTREE);};
+ my $out =
"$@($!)" if !$db || $@
;
+
eval {do "$main::data/prefix_data.pl" if !$out; }
;
+ $out
.
= $@ if $@;
$lru = LRU->newbase('Prefix', $lrusize);
return $out;
$lru = LRU->newbase('Prefix', $lrusize);
return $out;
@@
-481,9
+475,13
@@
sub cty_data
my @dxcc = extract($call);
if (@dxcc) {
my @dxcc = extract($call);
if (@dxcc) {
- return ($dxcc[1]->dxcc, $dxcc[1]->itu, $dxcc[1]->cq, $dxcc[1]->state, $dxcc[1]->city);
+ my $state = $dxcc[1]->state || '';
+ my $city = $dxcc[1]->city || '';
+ my $name = $dxcc[1]->name || '';
+
+ return ($dxcc[1]->dxcc, $dxcc[1]->itu, $dxcc[1]->cq, $state, $city, $name);
}
}
- return (666,0,0,'',''
);
+ return (666,0,0,'',''
,'Pirate-Country-QQ');
}
my %valid = (
}
my %valid = (