Merge branch 'newpc92timings' of /scm/spider into newpc92timings

[spider.git] / perl / Prefix.pm

diff --git a/perl/Prefix.pm b/perl/Prefix.pm
index a17966a3edc256f8ab22f5c685602f5bb6ebcaf7..68a5d65619080fc1b3bebc613b8496928de7c303 100644 (file)
--- a/perl/Prefix.pm
+++ b/perl/Prefix.pm
@@ -3,7 +3,7 @@
 #
 # Copyright (c) - Dirk Koopman G1TLH
 #
-# $Id$
+#
 #
 
 package Prefix;
@@ -19,12 +19,6 @@ use LRU;
 
 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
@@ -39,9 +33,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) {
@@ -70,15 +70,20 @@ sub load
        }
 
        # 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;
 }
 
+sub loaded
+{
+       return $db;
+}
+
 sub store
 {
        my ($k, $l);
@@ -462,6 +467,23 @@ 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) {
+               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,'','','Pirate-Country-QQ');             
+}
+
 my %valid = (
                         lat => '0,Latitude,slat',
                         long => '0,Longitude,slong',