X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FPrefix.pm;h=91f7c5cee44a3753cf90256ca565f007c16d033e;hb=d384410d4d5d1031cabab44350b80f2a55fe808d;hp=7e0eeb7a7c38538128c9f78e2367d293b37f09a2;hpb=dbf7523a9b228dbdf1d03109afde351b8b194fab;p=spider.git diff --git a/perl/Prefix.pm b/perl/Prefix.pm index 7e0eeb7a..91f7c5ce 100644 --- a/perl/Prefix.pm +++ b/perl/Prefix.pm @@ -14,7 +14,8 @@ use DB_File; use Data::Dumper; use DXDebug; use DXUtil; - +use USDB; +use LRU; use strict; @@ -24,26 +25,69 @@ $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); +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 + +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 if ($db) { undef $db; untie %pre; %pre = (); %prefix_loc = (); + $lru->close if $lru; + undef $lru; } - $db = tie(%pre, "DB_File", undef, O_RDWR|O_CREAT, 0666, $DB_BTREE) or confess "can't tie \%pre ($!)"; + + # 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 $@; - # print Data::Dumper->Dump([\%pre, \%prefix_loc], [qw(pre prefix_loc)]); - return $out; + $lru = LRU->newbase('Prefix', $lrusize); + + return $out; +} + +sub loaded +{ + return $db; } sub store @@ -97,20 +141,16 @@ sub store # This routine will only do what you ask for, if you wish to be intelligent # then that is YOUR problem! # + sub get { my $key = shift; - my @out; - my @outref; my $ref; - my $gotkey; - - $gotkey = $key; + my $gotkey = $key; return () if $db->seq($gotkey, $ref, R_CURSOR); return () if $key ne substr $gotkey, 0, length $key; - @outref = map { $prefix_loc{$_} } split ',', $ref; - return ($gotkey, @outref); + return ($gotkey, map { $prefix_loc{$_} } split ',', $ref); } # @@ -120,16 +160,38 @@ sub get sub next { my $key = shift; - my @out; - my @outref; my $ref; my $gotkey; return () if $db->seq($gotkey, $ref, R_NEXT); return () if $key ne substr $gotkey, 0, length $key; - @outref = map { $prefix_loc{$_} } split ',', $ref; - return ($gotkey, @outref); + 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); } # @@ -140,16 +202,33 @@ sub next sub matchprefix { my $pref = shift; + my @partials; for (my $i = length $pref; $i; $i--) { + $matchtotal++; my $s = substr($pref, 0, $i); - my @out = get($s); - if (isdbg('prefix')) { - my $part = $out[0] || "*"; - $part .= '*' unless $part eq '*' || $part eq $s; - dbg("Partial prefix: $pref $s $part" ); - } - return @out if @out && $out[0] eq $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++; + my @out = get($s); + if (isdbg('prefix')) { + my $part = $out[0] || "*"; + $part .= '*' unless $part eq '*' || $part eq $s; + dbg("Partial prefix: $pref $s $part" ); + } + if (@out && $out[0] eq $s) { + return @out; + } + } } return (); } @@ -169,14 +248,43 @@ sub extract my $p; my @parts; my ($call, $sp, $i); - + LM: foreach $call (split /,/, $calls) { - # first check if the whole thing succeeds - my @nout = get($call); - if (@nout && $nout[0] eq $call) { - dbg("got exact prefix: $nout[0]") if isdbg('prefix'); - push @out, @nout; + + # 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; + if ($p) { + $hits++; + if (isdbg('prefix')) { + my $percent = sprintf "%.1f", $hits * 100 / $misses; + dbg("Prefix Cache Hit: $call Hits: $hits/$misses of $matchtotal = $percent\%"); + } + push @out, @$p; next; + } 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; + } } # now split the call into parts if required @@ -192,6 +300,8 @@ LM: foreach $call (split /,/, $calls) { @nout = get($s); if (@nout && $nout[0] eq $s) { dbg("got exact multipart prefix: $call $s") if isdbg('prefix'); + $misses++; + lru_put($call, \@nout); push @out, @nout; next; } @@ -210,6 +320,8 @@ LM: foreach $call (split /,/, $calls) { my @try = get($s); if (@try && $try[0] eq $s) { dbg("got 3 part prefix: $call $s") if isdbg('prefix'); + $misses++; + lru_put($call, \@try); push @out, @try; next; } @@ -231,6 +343,8 @@ LM: foreach $call (split /,/, $calls) { my @try = get($s); if (@try && $try[0] eq $s) { dbg("got 2 part prefix: $call $s") if isdbg('prefix'); + $misses++; + lru_put($call, \@try); push @out, @try; next; } @@ -244,7 +358,9 @@ LM: foreach $call (split /,/, $calls) { if (@parts == 1) { @nout = matchprefix($parts[0]); if (@nout) { - dbg("got prefix: $call ]") if isdbg('prefix'); + dbg("got prefix: $call = $nout[0]") if isdbg('prefix'); + $misses++; + lru_put($call, \@nout); push @out, @nout; next; } @@ -288,11 +404,17 @@ L1: for ($n = 0; $n < @parts; $n++) { dbg("Compound prefix: $try $part" ); } if (@try && $try eq $try[0]) { + $misses++; + lru_put($call, \@try); push @out, @try; } else { + $misses++; + lru_put($call, \@nout); push @out, @nout; } } else { + $misses++; + lru_put($call, \@nout); push @out, @nout; } next LM; @@ -300,16 +422,57 @@ L1: for ($n = 0; $n < @parts; $n++) { } # we are a pirate! - push @out, matchprefix('Q'); + @nout = matchprefix('Q'); + $misses++; + lru_put($call, \@nout); + push @out, @nout; } - if (isdbg('prefix')) { + if (isdbg('prefixdata')) { my $dd = new Data::Dumper([ \@out ], [qw(@out)]); dbg($dd->Dumpxs); } 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; +} + my %valid = ( lat => '0,Latitude,slat', long => '0,Longitude,slong', @@ -317,29 +480,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