X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FPrefix.pm;h=2fab0e0b4f9437812f5737a77034c8b815f36955;hb=5d10d2095199b0d798926fa9e79a3f580c296b67;hp=da173ce175eb631a55bdfe50cf245869c9542279;hpb=dc305f992d75a6b35edda9e1aefab510a3ed617e;p=spider.git

diff --git a/perl/Prefix.pm b/perl/Prefix.pm
index da173ce1..2fab0e0b 100644
--- a/perl/Prefix.pm
+++ b/perl/Prefix.pm
@@ -3,7 +3,7 @@
 #
 # Copyright (c) - Dirk Koopman G1TLH
 #
-# $Id$
+#
 #
 
 package Prefix;
@@ -16,22 +16,17 @@ use DXDebug;
 use DXUtil;
 use USDB;
 use LRU;
+use DXBearing;
 
 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
 %prefix_loc = ();				# the meat of the info
 %pre = ();						# the prefix list
 $hits = $misses = $matchtotal = 1;		# cache stats
-$lrusize = 1000;				# size of prefix LRU cache
+$lrusize = 5000;				# size of prefix LRU cache
 
 sub init
 {
@@ -78,7 +73,10 @@ sub load
 	# tie the main prefix database
 	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; };
+	my $fn = localdata("prefix_data.pl");
+	die "Prefix.pm: cannot find $fn, have you run /spider/perl/create_prefix.pl?" unless -e $fn;
+	
+	eval {do $fn if !$out; };
 	$out .= $@ if $@;
 	$lru = LRU->newbase('Prefix', $lrusize);
 
@@ -90,49 +88,6 @@ sub loaded
 	return $db;
 }
 
-sub store
-{
-	my ($k, $l);
-	my $fh = new IO::File;
-	my $fn = "$main::data/prefix_data.pl";
-  
-	confess "Prefix system not started" if !$db;
-  
-	# save versions!
-	rename "$fn.oooo", "$fn.ooooo" if -e "$fn.oooo";
-	rename "$fn.ooo", "$fn.oooo" if -e "$fn.ooo";
-	rename "$fn.oo", "$fn.ooo" if -e "$fn.oo";
-	rename "$fn.o", "$fn.oo" if -e "$fn.o";
-	rename "$fn", "$fn.o" if -e "$fn";
-  
-	$fh->open(">$fn") or die "Can't open $fn ($!)";
-
-	# prefix location data
-	$fh->print("%prefix_loc = (\n");
-	foreach $l (sort {$a <=> $b} keys %prefix_loc) {
-		my $r = $prefix_loc{$l};
-		$fh->printf("   $l => bless( { name => '%s', dxcc => %d, itu => %d, utcoff => %d, lat => %f, long => %f }, 'Prefix'),\n",
-					$r->{name}, $r->{dxcc}, $r->{itu}, $r->{cq}, $r->{utcoff}, $r->{lat}, $r->{long});
-	}
-	$fh->print(");\n\n");
-
-	# prefix data
-	$fh->print("%pre = (\n");
-	foreach $k (sort keys %pre) {
-		$fh->print("   '$k' => [");
-		my @list = @{$pre{$k}};
-		my $l;
-		my $str;
-		foreach $l (@list) {
-			$str .= " $l,";
-		}
-		chop $str;  
-		$fh->print("$str ],\n");
-	}
-	$fh->print(");\n");
-	undef $fh;
-	untie %pre; 
-}
 
 # what you get is a list that looks like:-
 # 
@@ -176,6 +131,7 @@ sub next
 sub lru_put
 {
 	my ($call, $ref) = @_;
+	$call =~ s/^=//;
 	my @s = USDB::get($call);
 	
 	if (@s) {
@@ -251,12 +207,26 @@ sub extract
 
 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++;
 		$call =~ s/-\d+$//;		# ignore SSIDs
-		my $p = $lru->get($call);
 		my @nout;
+		my $ecall = "=$call";
+
+		# first check if this is a call (by prefixing it with an = sign)
+		my $p = $lru->get($ecall);
+		if ($p) {
+			$hits++;
+			if (isdbg('prefix')) {
+				my $percent = sprintf "%.1f", $hits * 100 / $misses;
+				dbg("Prefix Exact Cache Hit: $call Hits: $hits/$misses of $matchtotal = $percent\%");
+			}
+			push @out, @$p;
+			next;
+		}
+
+		# then 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)
+		$p = $lru->get($call);
 		if ($p) {
 			$hits++;
 			if (isdbg('prefix')) {
@@ -265,26 +235,37 @@ LM:	foreach $call (split /,/, $calls) {
 			}
 			push @out, @$p;
 			next;
+		}
+
+		# 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] = $ecall if @nout;
 		} else {
-			
-			# 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++;
-				lru_put($call, \@nout);
-				dbg("got exact prefix: $nout[0]") if isdbg('prefix');
-				push @out, @nout;
-				next;
-			}
+			# try a straight get for an exact callsign
+			@nout = get($ecall);
+		}
+
+		# now store the exact prefix if it has been found
+		if (@nout && $nout[0] eq $ecall) {
+			$misses++;
+			$nout[0] = $call;
+			lru_put("=$call", \@nout);
+			dbg("got exact prefix: $nout[0]") if isdbg('prefix');
+			push @out, @nout;
+			next;
+		}
+
+		# now try a non-exact call/prefix
+		if ((@nout = get($call)) && $nout[0] eq $call) {
+			$misses++;
+			lru_put($call, \@nout);
+			dbg("got exact prefix: $nout[0]") if isdbg('prefix');
+			push @out, @nout;
+			next;
 		}
 
 		# now split the call into parts if required
@@ -422,7 +403,7 @@ L1:		for ($n = 0; $n < @parts; $n++) {
 		}
 
 		# we are a pirate!
-		@nout = matchprefix('Q');
+		@nout = matchprefix('QQ');
 		$misses++;
 		lru_put($call, \@nout);
 		push @out, @nout;
@@ -501,6 +482,7 @@ my %valid = (
 			 city => '0,City',
 			 utcoff => '0,UTC offset',
 			 cont => '0,Continent',
+			 qra => '0,Locator',
 			);
 
 sub AUTOLOAD