X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FPrefix.pm;h=2572cb8794f5a2b801ab97d904fd30cadcc4309f;hb=b9dffeff7239952814342dad19db3a51def6fab7;hp=3fdcdceaf8aa1823b43dedd01d3cbfb297fc28d0;hpb=d80e548735a53ddf74561e54956ddf94116608d0;p=spider.git

diff --git a/perl/Prefix.pm b/perl/Prefix.pm
index 3fdcdcea..2572cb87 100644
--- a/perl/Prefix.pm
+++ b/perl/Prefix.pm
@@ -14,49 +14,74 @@ use DB_File;
 use Data::Dumper;
 use DXDebug;
 use DXUtil;
-
+use USDB;
+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 %cache $misses $hits $matchtotal $lasttime);
+use vars qw($db %prefix_loc %pre $lru $lrusize $misses $hits $matchtotal);
 
 $db = undef;					# the DB_File handle
 %prefix_loc = ();				# the meat of the info
 %pre = ();						# the prefix list
-%cache = ();					# a runtime cache of matched prefixes
-$lasttime = 0;					# last time this cache was cleared
 $hits = $misses = $matchtotal = 1;		# cache stats
+$lrusize = 1000;				# size of prefix LRU cache
 
-#my $cachefn = "$main::data/prefix_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
-#	unlink $cachefn;
-	
 	if ($db) {
 		undef $db;
 		untie %pre;
 		%pre = ();
 		%prefix_loc = ();
-		untie %cache;
+		$lru->close if $lru;
+		undef $lru;
 	}
 
 	# 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 $@;
-
-	# tie the prefix cache
-#	tie (%cache, "DB_File", $cachefn, O_RDWR|O_CREAT, 0664, $DB_HASH) or confess "can't tie prefix cache to $cachefn $!";
-	return $out;
+	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
@@ -135,7 +160,32 @@ sub next
 	return () if $db->seq($gotkey, $ref, R_NEXT);
 	return () if $key ne substr $gotkey, 0, length $key;
   
-	return ($gotkey, map { $prefix_loc{$_} } split ',', $ref);
+	return ($gotkey,  map { $prefix_loc{$_} } split ',', $ref);
+}
+
+#
+# put the key LRU incluing the city state info
+#
+
+sub lru_put
+{
+	my ($call, $ref) = @_;
+	my @s = USDB::get($call);
+	
+	if (@s) {
+		# this is deep magic, because this is a reference to static data, it
+        # must be copied.
+		my $h = { %{$ref->[1]} };
+		bless $h, ref $ref->[1];
+		$h->{city} = $s[0];
+		$h->{state} = $s[1];
+		$ref->[1] = $h;
+	} else {
+		$ref->[1]->{city} = $ref->[1]->{state} = "" unless exists $ref->[1]->{state};
+	}
+	
+	dbg("Prefix::lru_put $call -> ($ref->[1]->{city}, $ref->[1]->{state})") if isdbg('prefix');
+	$lru->put($call, $ref);
 }
 
 # 
@@ -148,21 +198,21 @@ sub matchprefix
 	my $pref = shift;
 	my @partials;
 
-	$pref =~ s/-\d+$//;
 	for (my $i = length $pref; $i; $i--) {
 		$matchtotal++;
 		my $s = substr($pref, 0, $i);
-		my $p = $cache{$s};
+		push @partials, $s;
+		my $p = $lru->get($s);
 		if ($p) {
 			$hits++;
 			if (isdbg('prefix')) {
 				my $percent = sprintf "%.1f", $hits * 100 / $misses;
 				dbg("Partial Prefix Cache Hit: $s Hits: $hits/$misses of $matchtotal = $percent\%");
 			}
+			lru_put($_, $p) for @partials;
 			return @$p;
 		} else {
 			$misses++;
-			push @partials, $s;
 			my @out = get($s);
 			if (isdbg('prefix')) {
 				my $part = $out[0] || "*";
@@ -170,7 +220,6 @@ sub matchprefix
 				dbg("Partial prefix: $pref $s $part" );
 			} 
 			if (@out && $out[0] eq $s) {
-				$cache{$_} =  \@out for @partials;
 				return @out;
 			} 
 		}
@@ -194,23 +243,13 @@ sub extract
 	my @parts;
 	my ($call, $sp, $i);
 
-	# clear out the cache periodically to stop it growing for ever.
-	if ($main::systime - $lasttime >= 20*60) {
-		if (isdbg('prefix')) {
-			my $percent = sprintf "%.1f", $hits * 100 / $misses;
-			dbg("Prefix Cache Cleared, Hits: $hits/$misses of $matchtotal = $percent\%") ;
-		}
-		%cache =();
-		$lasttime = $main::systime;
-		$hits = $matchtotal = 0;
-	}
-
 LM:	foreach $call (split /,/, $calls) {
 
 		# first check if the whole thing succeeds either because it is cached
 		# or because it simply is a stored prefix as callsign (or even a prefix)
 		$matchtotal++;
-		my $p = $cache{$call};
+		$call =~ s/-\d+$//;		# ignore SSIDs
+		my $p = $lru->get($call);
 		my @nout;
 		if ($p) {
 			$hits++;
@@ -221,10 +260,21 @@ LM:	foreach $call (split /,/, $calls) {
 			push @out, @$p;
 			next;
 		} else {
-			@nout =  get($call);
+			
+			# is it in the USDB, force a matchprefix to match?
+			my @s = USDB::get($call);
+			if (@s) {
+				@nout = get($call);
+				@nout = matchprefix($call) unless @nout;
+				$nout[0] = $call if @nout;
+			} else {
+				@nout =  get($call);
+			}
+
+			# now store it
 			if (@nout && $nout[0] eq $call) {
 				$misses++;
-				$cache{$call} = \@nout;
+				lru_put($call, \@nout);
 				dbg("got exact prefix: $nout[0]") if isdbg('prefix');
 				push @out, @nout;
 				next;
@@ -245,7 +295,7 @@ LM:	foreach $call (split /,/, $calls) {
 			if (@nout && $nout[0] eq $s) {
 				dbg("got exact multipart prefix: $call $s") if isdbg('prefix');
 				$misses++;
-				$cache{$call} = \@nout;
+				lru_put($call, \@nout);
 				push @out, @nout;
 				next;
 			}
@@ -265,7 +315,7 @@ LM:	foreach $call (split /,/, $calls) {
 				if (@try && $try[0] eq $s) {
 					dbg("got 3 part prefix: $call $s") if isdbg('prefix');
 					$misses++;
-					$cache{$call} = \@try;
+					lru_put($call, \@try);
 					push @out, @try;
 					next;
 				}
@@ -288,7 +338,7 @@ LM:	foreach $call (split /,/, $calls) {
 				if (@try && $try[0] eq $s) {
 					dbg("got 2 part prefix: $call $s") if isdbg('prefix');
 					$misses++;
-					$cache{$call} = \@try;
+					lru_put($call, \@try);
 					push @out, @try;
 					next;
 				}
@@ -304,7 +354,7 @@ LM:	foreach $call (split /,/, $calls) {
 			if (@nout) {
 				dbg("got prefix: $call = $nout[0]") if isdbg('prefix');
 				$misses++;
-				$cache{$call} = \@nout;
+				lru_put($call, \@nout);
 				push @out, @nout;
 				next;
 			}
@@ -349,16 +399,16 @@ L1:		for ($n = 0; $n < @parts; $n++) {
 					}
 					if (@try && $try eq $try[0]) {
 						$misses++;
-						$cache{$call} = \@try;
+						lru_put($call, \@try);
 						push @out, @try;
 					} else {
 						$misses++;
-						$cache{$call} = \@nout;
+						lru_put($call, \@nout);
 						push @out, @nout;
 					}
 				} else {
 					$misses++;
-					$cache{$call} = \@nout;
+					lru_put($call, \@nout);
 					push @out, @nout;
 				}
 				next LM;
@@ -368,7 +418,7 @@ L1:		for ($n = 0; $n < @parts; $n++) {
 		# we are a pirate!
 		@nout = matchprefix('Q');
 		$misses++;
-		$cache{$call} = \@nout;
+		lru_put($call, \@nout);
 		push @out, @nout;
 	}
 	
@@ -379,6 +429,61 @@ L1:		for ($n = 0; $n < @parts; $n++) {
 	return @out;
 }
 
+#
+# turn a list of prefixes / dxcc numbers into a list of dxcc/itu/zone numbers
+#
+# nc = dxcc
+# ni = itu
+# nz = zone
+# ns = state
+#
+
+sub to_ciz
+{
+	my $cmd = shift;
+	my @out;
+	
+	foreach my $v (@_) {
+		if ($cmd ne 'ns' && $v =~ /^\d+$/) {	
+			push @out, $v unless grep $_ eq $v, @out;
+		} else {
+			if ($cmd eq 'ns' && $v =~ /^[A-Z][A-Z]$/i) {
+				push @out, uc $v unless grep $_ eq uc $v, @out;
+			} else {
+				my @pre = Prefix::extract($v);
+				if (@pre) {
+					shift @pre;
+					foreach my $p (@pre) {
+						my $n = $p->dxcc if $cmd eq 'nc' ;
+						$n = $p->itu if $cmd eq 'ni' ;
+						$n = $p->cq if $cmd eq 'nz' ;
+						$n = $p->state if $cmd eq 'ns';
+						push @out, $n unless grep $_ eq $n, @out;
+					}
+				}
+			}			
+		}
+	}
+	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',
@@ -386,29 +491,26 @@ my %valid = (
 			 name => '0,Name',
 			 itu => '0,ITU',
 			 cq => '0,CQ',
+			 state => '0,State',
+			 city => '0,City',
 			 utcoff => '0,UTC offset',
 			 cont => '0,Continent',
 			);
 
-no strict;
 sub AUTOLOAD
 {
-	my $self = shift;
+	no strict;
 	my $name = $AUTOLOAD;
   
 	return if $name =~ /::DESTROY$/;
-	$name =~ s/.*:://o;
+	$name =~ s/^.*:://o;
   
 	confess "Non-existant field '$AUTOLOAD'" if !$valid{$name};
 	# 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}} ;
-	if (@_) {
-		$self->{$name} = shift;
-	}
-	return $self->{$name};
+	*$AUTOLOAD = sub {@_ > 1 ? $_[0]->{$name} = $_[1] : $_[0]->{$name}} ;
+       goto &$AUTOLOAD;
 }
-use strict;
 
 #
 # return a prompt for a field