make sure that state and city are defined

[spider.git] / perl / Prefix.pm

diff --git a/perl/Prefix.pm b/perl/Prefix.pm
index 5733ff0254c689dabde03a16371b1f412b442d48..48206cea6b4cce0a861b4dcc775b3e5789bdefa8 100644 (file)
--- a/perl/Prefix.pm
+++ b/perl/Prefix.pm
@@ -31,9 +31,37 @@ $db = undef;                                 # the DB_File handle
 %prefix_loc = ();                              # the meat of the info
 %pre = ();                                             # the prefix list
 $hits = $misses = $matchtotal = 1;             # cache stats
-$lrusize = 2000;                               # size of prefix LRU cache
+$lrusize = 1000;                               # size of prefix LRU cache
 
-$lru = LRU->newbase('Prefix', $lrusize);
+sub init
+{
+       my $r = load();
+       return $r if $r;
+
+       # fix up the node's default country codes
+       unless (@main::my_cc) {
+               push @main::my_cc, (61..67) if $main::mycall =~ /^GB/;
+               push @main::my_cc, qw(EA EA6 EA8 EA9) if $main::mycall =~ /^E[ABCD]/;
+               push @main::my_cc, qw(I IT IS) if $main::mycall =~ /^I/;
+               push @main::my_cc, qw(SV SV5 SV9) if $main::mycall =~ /^SV/;
+
+               # catchall
+               push @main::my_cc, $main::mycall unless @main::my_cc;
+       }
+
+       my @c;
+       for (@main::my_cc) {
+               if (/^\d+$/) {
+                       push @c, $_;
+               } else {
+                       my @dxcc = extract($_);
+                       push @c, $dxcc[1]->dxcc if @dxcc > 1;
+               }
+       }
+       return "\@main::my_cc does not contain a valid prefix or callsign (" . join(',', @main::my_cc) . ")" unless @c;
+       @main::my_cc = @c;
+       return undef;
+}
 
 sub load
 {
@@ -43,6 +71,8 @@ sub load
                untie %pre;
                %pre = ();
                %prefix_loc = ();
+               $lru->close if $lru;
+               undef $lru;
        }
 
        # tie the main prefix database
@@ -50,10 +80,16 @@ sub load
        my $out = $@ if $@;
        do "$main::data/prefix_data.pl" if !$out;
        $out = $@ if $@;
+       $lru = LRU->newbase('Prefix', $lrusize);
 
        return $out;
 }
 
+sub loaded
+{
+       return $db;
+}
+
 sub store
 {
        my ($k, $l);
@@ -437,6 +473,19 @@ sub to_ciz
        return @out;
 }
 
+# get the full country data (dxcc, itu, cq, state, city) as a list
+# from a callsign. 
+sub cty_data
+{
+       my $call = shift;
+       
+       my @dxcc = extract($call);
+       if (@dxcc) {
+               return ($dxcc[1]->dxcc, $dxcc[1]->itu, $dxcc[1]->cq, ($dxcc[1]->state||''), ($dxcc[1]->city||''));
+       }
+       return (666,0,0,'','');         
+}
+
 my %valid = (
                         lat => '0,Latitude,slat',
                         long => '0,Longitude,slong',
@@ -452,7 +501,6 @@ my %valid = (
 
 sub AUTOLOAD
 {
-       my $self = shift;
        no strict;
        my $name = $AUTOLOAD;
   
@@ -463,7 +511,7 @@ sub AUTOLOAD
        # this clever line of code creates a subroutine which takes over from autoload
        # from OO Perl - Conway
        *$AUTOLOAD = sub {@_ > 1 ? $_[0]->{$name} = $_[1] : $_[0]->{$name}} ;
-       &$AUTOLOAD($self, @_);
+       goto &$AUTOLOAD;
 }
 
 #