X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FSpot.pm;h=bed8bd20297372fbca7e14233942e1c68029fb77;hb=c83b1ca22765fc07e5adcdc8dac24cbd066c9b95;hp=74b3f77319decf08c9f004a471d7cc34b46161e4;hpb=b25a235529526f5d2d653322800d2f5f1e0ae760;p=spider.git diff --git a/perl/Spot.pm b/perl/Spot.pm index 74b3f773..bed8bd20 100644 --- a/perl/Spot.pm +++ b/perl/Spot.pm @@ -18,6 +18,8 @@ use Prefix; use DXDupe; use Data::Dumper; use QSL; +use DXSql; +use Julian; use strict; @@ -39,16 +41,26 @@ $filterdef = bless ([ ['on', 'r', 0, 0, \&decodefreq], ['call', 'c', 1], ['info', 't', 3], + ['spotter', 'c', 4], ['by', 'c', 4], + ['dxcc', 'nc', 5], ['call_dxcc', 'nc', 5], ['by_dxcc', 'nc', 6], ['origin', 'c', 7, 9], ['call_itu', 'ni', 8], + ['itu', 'ni', 8], ['call_zone', 'nz', 9], + ['cq', 'nz', 9], + ['zone', 'nz', 9], ['by_itu', 'ni', 10], + ['byitu', 'ni', 10], ['by_zone', 'nz', 11], + ['byzone', 'nz', 11], + ['bycq', 'nz', 11], ['call_state', 'ns', 12], + ['state', 'ns', 12], ['by_state', 'ns', 13], + ['bystate', 'ns', 13], ['ip', 'c', 14], # ['channel', 'c', 15], # ['rbn', 'a', 4, 0, \&filterrbnspot], @@ -56,10 +68,13 @@ $filterdef = bless ([ $totalspots = $hfspots = $vhfspots = 0; $use_db_for_search = 0; -our $usetac = 0; -our $readback; +our %spotcache; # the cache of data within the last $spotcachedays 0 or 2+ days +our $spotcachedays = 0; + + +our $readback = 1; -if ($usetac) { +if ($readback) { $readback = `which tac`; chomp $readback; } @@ -82,7 +97,7 @@ sub decodefreq foreach $f (@f) { my ($a, $b); - if (m{^\d+/\d+$}) { + if ($f =~ m{^\d+/\d+$}) { push @out, $f; } elsif (($a, $b) = $f =~ m{^(\w+)(?:/(\w+))?$}) { $b = lc $b if $b; @@ -115,6 +130,7 @@ sub init mkdir "$dirprefix", 0777 if !-e "$dirprefix"; $fp = DXLog::new($dirprefix, "dat", 'd'); $statp = DXLog::new($dirprefix, "dys", 'd'); + my $today = Julian::Day->new(time); # load up any old spots if ($main::dbh) { @@ -125,7 +141,6 @@ sub init $main::dbh->spot_create_table; my $now = Julian::Day->alloc(1995, 0); - my $today = Julian::Day->new(time); my $sth = $main::dbh->spot_insert_prepare; while ($now->cmp($today) <= 0) { my $fh = $fp->open($now); @@ -168,6 +183,34 @@ sub init dbg("added ipaddr field to spot table"); } } + + # initialise the cache if required + if ($spotcachedays) { + $spotcachedays = 2 if $spotcachedays < 2; + my $now = $today->sub($spotcachedays); + while ($now->cmp($today) >= 0) { + my $fh = $fp->open($now); + if ($fh) { + my @in; + while (<$fh>) { + chomp; + my @s = split /\^/; + if (@s < 14) { + my @a = (Prefix::cty_data($s[1]))[1..3]; + my @b = (Prefix::cty_data($s[4]))[1..3]; + push @s, $b[1] if @s < 7; + push @s, '' if @s < 8; + push @s, @a[0,1], @b[0,1] if @s < 12; + push @s, $a[2], $b[2] if @s < 14; + } + push @in, \@s; + } + $fh->close; + $spotcache{"$now->[0]|$now->[1]"} = \@in; + } + $now->add(1); + } + } } sub prefix @@ -176,6 +219,8 @@ sub prefix } # fix up the full spot data from the basic spot data +# input is +# freq, call, time, comment, spotter, origin[, ip_address] sub prepare { # $freq, $call, $t, $comment, $spotter, node, ip address = @_ @@ -201,7 +246,7 @@ sub prepare push @out, $_[6] if $_[6] && is_ipaddr($_[6]); # thus we now have: - # freq, call, time, comment, spotter, call country code, call itu, call cqzone, spotter country code, spotter itu, spotter cqzone, call state, spotter state, node, spotter ip address + # freq, call, time, comment, spotter, call country code, spotter country code, origin, call itu, call cqzone, spotter itu, spotter cqzone, call state, spotter state, spotter ip address return @out; } @@ -209,6 +254,19 @@ sub add { my $buf = join('^', @_); $fp->writeunix($_[2], $buf); + if ($spotcachedays) { + my $now = Julian::Day->new($_[2]); + my $day = "$now->[0]|$now->[1]"; + my $r = exists $spotcache{$day} ? $spotcache{$day} : $spotcache{$day} = []; + unshift @$r, @_; + + # remove old days + while (keys %spotcache > $spotcachedays+1) { + while (sort keys %spotcache > $spotcachedays+1) { + delete $spotcache{$_}; + } + } + } if ($main::dbh) { $main::dbh->begin_work; $main::dbh->spot_insert(\@_); @@ -240,7 +298,13 @@ sub add # $f5 = spotted dxcc country # $f6 = spotter dxcc country # $f7 = origin -# $f8 = ip address +# $f8 = spotted itu +# $f9 = spotted cq zone +# $f10 = spotter itu +# $f11 = spotter cq zone +# $f12 = spotted us state +# $f13 = spotter us state +# $f14 = ip address # # In addition you can specify a range of days, this means that it will start searching # from days less than today to days less than today @@ -253,8 +317,7 @@ sub add sub search { - my ($expr, $dayfrom, $dayto, $from, $to, $hint, $dxchan) = @_; - my $eval; + my ($expr, $dayfrom, $dayto, $from, $to, $hint, $dofilter, $dxchan) = @_; my @out; my $ref; my $i; @@ -276,88 +339,73 @@ sub search $to = $from + $maxspots if $to - $from > $maxspots || $to - $from <= 0; if ($main::dbh && $use_db_for_search) { - return $main::dbh->spot_search($expr, $dayfrom, $dayto, $to-$from, $dxchan); + return $main::dbh->spot_search($expr, $dayfrom, $dayto, $from, $to, $hint, $dofilter, $dxchan); } - $expr =~ s/\$f(\d\d?)/\$ref->[$1]/g; # swap the letter n for the correct field name + # $expr =~ s/\$f(\d\d?)/\$ref->[$1]/g; # swap the letter n for the correct field name # $expr =~ s/\$f(\d)/\$spots[$1]/g; # swap the letter n for the correct field name - my $checkfilter; - $checkfilter = qq ( - if (\@s < 9) { - my \@a = (Prefix::cty_data(\$s[1]))[1..3]; - my \@b = (Prefix::cty_data(\$s[4]))[1..3]; - push \@s, \@a[0,1], \@b[0,1], \$a[2], \$a[2]; - } else { - \$s[12] ||= ' '; - \$s[13] ||= ' '; - } - my (\$filter, \$hops) = \$dxchan->{spotsfilter}->it(\@s); - next unless (\$filter); - ) if $dxchan; - $checkfilter ||= ' '; - - dbg("hint='$hint', expr='$expr', spotno=$from-$to, day=$dayfrom-$dayto\n") if isdbg('search'); + + dbg("Spot::search hint='$hint', expr='$expr', spotno=$from-$to, day=$dayfrom-$dayto\n") if isdbg('search'); # build up eval to execute - $eval = qq( - while (<\$fh>) { - $hint; - chomp; - my \@s = split /\\^/; - $checkfilter; - push \@spots, \\\@s; - } - my \$c; - my \$ref; - if (\$readback) { - foreach \$ref (\@spots) { - if ($expr) { - \$count++; - next if \$count < $from; # wait until from - push(\@out, \$ref); - last if \$count >= $to; # stop after to - } - } - } else { - for (\$c = \$#spots; \$c >= 0; \$c--) { - \$ref = \$spots[\$c]; - if ($expr) { - \$count++; - next if \$count < $from; # wait until from - push(\@out, \$ref); - last if \$count >= $to; # stop after to - } - } - } - ); - + dbg("Spot::search Spot eval: $expr") if isdbg('searcheval'); + $expr =~ s/\$r/\$_[0]/g; + my $eval = qq{ sub { return $expr; } }; + dbg("Spot::search Spot eval: $eval") if isdbg('searcheval'); + my $ecode = eval $eval; + return ("Spot search error", $@) if $@; - - dbg("Spot eval: $eval") if isdbg('searcheval'); my $fh; my $now = $fromdate; - for ($i = $count = 0; $i < $maxdays; ++$i) { # look thru $maxdays worth of files only - my @spots; + my $today = Julian::Day->new($main::systime); + + for ($i = $count = 0; $count < $to && $i < $maxdays; ++$i) { # look thru $maxdays worth of files only last if $now->cmp($todate) <= 0; - + + if ($spotcachedays) { + + } + my $fn = $fp->fn($now->sub($i)); if ($readback) { - my $fn = $fp->fn($now->sub($i)); - dbg("search using tac fn: $fn $i") if isdbg('search'); + dbg("Spot::search search using tac fn: $fn $i") if isdbg('search'); $fh = IO::File->new("$readback $fn |"); - } else { - $fh = $fp->open($now->sub($i)); # get the next file - dbg("search fn: $fp->{fn} $i") if isdbg('search'); + } + else { + dbg("Spot::search search fn: $fp->{fn} $i") if isdbg('search'); + $fh = $fp->open($now->sub($i)); # get the next file } if ($fh) { + my $rec = 0; my $in; - eval $eval; # do the search on this file + while (<$fh>) { + chomp; + my @r = split /\^/; + ++$rec; + if ($dofilter && $dxchan && $dxchan->{spotsfilter}) { + my ($gotone, undef) = $dxchan->{spotsfilter}->it(@r); + next unless $gotone; + } + if (&$ecode(\@r)) { + ++$count; + next if $count < $from; + if ($readback) { + push @out, \@r; + last if $count >= $to; + } else { + push @out, \@r; + shift @out if $count >= $to; + } + } + } + dbg("Spot::search recs read: $rec") if isdbg('search'); last if $count >= $to; # stop after to + return ("Spot search error", $@) if $@; } } - + @out = sort {$b->[2] <=> $a->[2]} @out if @out; return @out; } @@ -398,24 +446,6 @@ sub formatl return sprintf "%8.1f %-11s %s %s %-28.28s%7s>", $_[0], $_[1], $d, $t, ($_[3]||''), "<$_[4]" ; } -# -# return all the spots from a day's file as an array of references -# the parameter passed is a julian day -sub readfile($) -{ - my @spots; - - my $fh = $fp->open(shift); - if ($fh) { - my $in; - while (<$fh>) { - chomp; - push @spots, [ split '\^' ]; - } - } - return @spots; -} - # enter the spot for dup checking and return true if it is already a dup sub dup {