X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FPrefix.pm;h=bc8a0edf92ea3f411b6e2f242fe6eef824a228ad;hb=b463dee2efa3edb72fab9bf1c64364ea38408bec;hp=6f1c1f29a8849f23b4f753d6ab02eae75a905435;hpb=b00e85c55392ddf0593b681d7187e4c4e158568e;p=spider.git

diff --git a/perl/Prefix.pm b/perl/Prefix.pm
index 6f1c1f29..bc8a0edf 100644
--- a/perl/Prefix.pm
+++ b/perl/Prefix.pm
@@ -33,6 +33,36 @@ $db = undef;					# the DB_File handle
 $hits = $misses = $matchtotal = 1;		# cache stats
 $lrusize = 1000;				# size of prefix LRU cache
 
+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
 {
 	# untie every thing
@@ -55,6 +85,11 @@ sub load
  	return $out;
 }
 
+sub loaded
+{
+	return $db;
+}
+
 sub store
 {
 	my ($k, $l);
@@ -438,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',
@@ -453,7 +501,6 @@ my %valid = (
 
 sub AUTOLOAD
 {
-	my $self = shift;
 	no strict;
 	my $name = $AUTOLOAD;
   
@@ -464,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;
 }
 
 #