make sure that state and city are defined

[spider.git] / perl / Prefix.pm

diff --git a/perl/Prefix.pm b/perl/Prefix.pm
index a17966a3edc256f8ab22f5c685602f5bb6ebcaf7..48206cea6b4cce0a861b4dcc775b3e5789bdefa8 100644 (file)
--- a/perl/Prefix.pm
+++ b/perl/Prefix.pm
@@ -39,9 +39,15 @@ sub init
        return $r if $r;
 
        # fix up the node's default country codes
-       push @main::my_cc, (61..67) if !@main::my_cc && $main::mycall =~ /^GB/;
-       push @main::my_cc, qw(EA EA6 EA8 EA9) if !@main::my_cc && $main::mycall =~ /^E(ABCD)/;
-       push @main::my_cc, $main::mycall unless @main::my_cc;
+       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) {
@@ -79,6 +85,11 @@ sub load
        return $out;
 }
 
+sub loaded
+{
+       return $db;
+}
+
 sub store
 {
        my ($k, $l);
@@ -462,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',