X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FSpot.pm;h=bda988f8657bd684975c406db3b7a423b73c9435;hb=681ed7b3c6d79228a68054489058b619f62974bf;hp=9fcf3280d95ad8359516ee58c26e168114bb6f78;hpb=3525b8b90ab568e06f57d12c4c3ad9610b9e71f9;p=spider.git diff --git a/perl/Spot.pm b/perl/Spot.pm index 9fcf3280..bda988f8 100644 --- a/perl/Spot.pm +++ b/perl/Spot.pm @@ -18,6 +18,9 @@ use Prefix; use DXDupe; use Data::Dumper; use QSL; +use DXSql; +use Time::HiRes qw(gettimeofday tv_interval); + use strict; @@ -48,11 +51,13 @@ $filterdef = bless ([ ['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], @@ -64,6 +69,10 @@ $filterdef = bless ([ $totalspots = $hfspots = $vhfspots = 0; $use_db_for_search = 0; +our %spotcache; # the cache of data within the last $spotcachedays 0 or 2+ days +our $spotcachedays = 2; # default 2 days worth +our $minselfspotqrg = 1240000; # minimum freq above which self spotting is allowed + our $readback = 1; if ($readback) { @@ -122,6 +131,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) { @@ -132,7 +142,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); @@ -175,6 +184,39 @@ sub init dbg("added ipaddr field to spot table"); } } + + # initialise the cache if required + if ($spotcachedays > 0) { + my $t0 = [gettimeofday]; + $spotcachedays = 2 if $spotcachedays < 2; + dbg "Spot::init - reading in $spotcachedays days of spots into cache"; + for (my $i = 0; $i < $spotcachedays; ++$i) { + my $now = $today->sub($i); + my $fh = $fp->open($now); + if ($fh) { + my @in; + my $rec; + for ($rec = 0; <$fh>; ++$rec) { + 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; + } + unshift @in, \@s; + } + $fh->close; + dbg("Spot::init read $rec spots from " . _cachek($now)); + $spotcache{_cachek($now)} = \@in; + } + $now->add(1); + } + dbg("Spot::init $spotcachedays files of spots read into cache in " . _diffms($t0) . "mS") + } } sub prefix @@ -196,10 +238,9 @@ sub prepare # remove ssids and /xxx if present on spotter $out[4] =~ s/-\d+$//o; - # remove leading and trailing spaces + # remove leading and trailing spaces from comment field $out[3] = unpad($out[3]); - # add the 'dxcc' country on the end for both spotted and spotter, then the cluster call my @spd = Prefix::cty_data($out[1]); push @out, $spd[0]; @@ -218,6 +259,12 @@ sub add { my $buf = join('^', @_); $fp->writeunix($_[2], $buf); + if ($spotcachedays > 0) { + my $now = Julian::Day->new($_[2]); + my $day = _cachek($now); + my $r = (exists $spotcache{$day}) ? $spotcache{$day} : ($spotcache{$day} = []); + unshift @$r, \@_; + } if ($main::dbh) { $main::dbh->begin_work; $main::dbh->spot_insert(\@_); @@ -268,7 +315,7 @@ sub add sub search { - my ($expr, $dayfrom, $dayto, $from, $to, $hint, $dxchan) = @_; + my ($expr, $dayfrom, $dayto, $from, $to, $hint, $dofilter, $dxchan) = @_; my @out; my $ref; my $i; @@ -290,7 +337,7 @@ sub search $to = $from + $maxspots if $to - $from > $maxspots || $to - $from <= 0; if ($main::dbh && $use_db_for_search) { - return $main::dbh->spot_search($hint, $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 @@ -300,6 +347,7 @@ sub search dbg("Spot::search hint='$hint', expr='$expr', spotno=$from-$to, day=$dayfrom-$dayto\n") if isdbg('search'); # build up eval to execute + dbg("Spot::search Spot eval: $expr") if isdbg('searcheval'); $expr =~ s/\$r/\$_[0]/g; my $eval = qq{ sub { return $expr; } }; @@ -307,52 +355,72 @@ sub search my $ecode = eval $eval; return ("Spot search error", $@) if $@; - my $fh; my $now = $fromdate; - my @spots; - my $recs; + 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; - - my $fn = $fp->fn($now->sub($i)); - if ($readback) { - dbg("Spot::search search using tac fn: $fn $i") if isdbg('search'); - $fh = IO::File->new("$readback $fn |"); - } - 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; - while (<$fh>) { - my @r = split /\^/; + + + my $this = $now->sub($i); + my $fn = $fp->fn($this); + my $cachekey = _cachek($this); + my $rec = 0; + + if ($spotcachedays > 0 && $spotcache{$cachekey}) { + foreach my $r (@{$spotcache{$cachekey}}) { ++$rec; - if ($dxchan) { - my ($gotone, undef) = $dxchan->{spotsfilter}->it(@r); + if ($dofilter && $dxchan && $dxchan->{spotsfilter}) { + my ($gotone, undef) = $dxchan->{spotsfilter}->it(@$r); next unless $gotone; } - if (&$ecode(\@r)) { + 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; + push @out, $r; + last if $count >= $to; + } + } + dbg("Spot::search cache recs read: $rec") if isdbg('search'); + } else { + if ($readback) { + dbg("Spot::search search using tac fn: $fn $i") if isdbg('search'); + $fh = IO::File->new("$readback $fn |"); + } + 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 $in; + 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 file recs read: $rec") if isdbg('search'); + last if $count >= $to; # stop after to } - dbg("Spot::search recs read: $rec") if isdbg('search'); - last if $count >= $to; # stop after to - - return ("Spot search error", $@) if $@; } } + return ("Spot search error", $@) if $@; + @out = sort {$b->[2] <=> $a->[2]} @out if @out; return @out; } @@ -389,15 +457,26 @@ sub ftor # format a spot for user output in list mode sub formatl { - my $t = ztime($_[2]); - my $d = cldate($_[2]); - return sprintf "%8.1f %-11s %s %s %-28.28s%7s>", $_[0], $_[1], $d, $t, ($_[3]||''), "<$_[4]" ; + my $t = ztime($_[3]); + my $d = cldate($_[3]); + my $spotter = "<$_[5]>"; + my $comment = $_[4] || ''; + $comment =~ s/\t+/ /g; + my $cl = length $comment; + my $s = sprintf "%9.1f %-11s %s %s", $_[1], $_[2], $d, $t; + my $width = ($_[0] ? $_[0] : 80) - length($spotter) - length($s) - 4; + + $comment = substr $comment, 0, $width if $cl > $width; + $comment .= ' ' x ($width-$cl) if $cl < $width; + +# return sprintf "%8.1f %-11s %s %s %-28.28s%7s>", $_[0], $_[1], $d, $t, ($_[3]||''), "<$_[4]" ; + return "$s $comment$spotter"; } # enter the spot for dup checking and return true if it is already a dup sub dup { - my ($freq, $call, $d, $text, $by, $cty) = @_; + my ($freq, $call, $d, $text, $by, $node) = @_; # dump if too old return 2 if $d < $main::systime - $dupage; @@ -416,21 +495,16 @@ sub dup chomp $text; $text =~ s/\%([0-9A-F][0-9A-F])/chr(hex($1))/eg; $text = uc unpad($text); - if ($cty && $text && length $text <= 4) { - unless ($text =~ /^C?Q/ || $text =~ /^[\d\W]+$/) { - my @try = Prefix::cty_data($text); - $text = "" if $cty == $try[0]; - } - } my $otext = $text; # $text = Encode::encode("iso-8859-1", $text) if $main::can_encode && Encode::is_utf8($text, 1); $text =~ s/^\+\w+\s*//; # remove leading LoTW callsign $text =~ s/\s{2,}[\dA-Z]?[A-Z]\d?$// if length $text > 24; $text =~ s/[\W\x00-\x2F\x7B-\xFF]//g; # tautology, just to make quite sure! $text = substr($text, 0, $duplth) if length $text > $duplth; - my $ldupkey = "X$freq|$call|$by|$text"; + my $ldupkey = "X$|$call|$by|$node|$freq|$d|$text"; my $t = DXDupe::find($ldupkey); return 1 if $t && $t - $main::systime > 0; + DXDupe::add($ldupkey, $main::systime+$dupage); $otext = substr($otext, 0, $duplth) if length $otext > $duplth; $otext =~ s/\s+$//; @@ -440,7 +514,7 @@ sub dup return 1 if $t && $t - $main::systime > 0; DXDupe::add($ldupkey, $main::systime+$dupage); } - return 0; + return undef; } sub listdups @@ -448,11 +522,11 @@ sub listdups return DXDupe::listdups('X', $dupage, @_); } -sub genstats($) +sub genstats { my $date = shift; - my $in = $fp->open($date); - my $out = $statp->open($date, 'w'); + my $in = $fp->open($date) or dbg("Spot::genstats: Cannot open " . $fp->fn($date) . " $!"); + my $out = $statp->open($date, 'w') or dbg("Spot::genstats: Cannot open " . $statp->fn($date) . " $!"); my @freq; my %list; my @tot; @@ -495,7 +569,7 @@ sub genstats($) } # return true if the stat file is newer than than the spot file -sub checkstats($) +sub checkstats { my $date = shift; my $in = $fp->mtime($date); @@ -508,6 +582,26 @@ sub daily { my $date = Julian::Day->new($main::systime)->sub(1); genstats($date) unless checkstats($date); + clean_cache(); +} + +sub _cachek +{ + return "$_[0]->[0]|$_[0]->[1]"; +} + +sub clean_cache +{ + if ($spotcachedays > 0) { + my $now = Julian::Day->new($main::systime); + for (my $i = $spotcachedays; $i < $spotcachedays + 5; ++$i ) { + my $k = _cachek($now->sub($i)); + if (exists $spotcache{$k}) { + dbg("Spot::spotcache deleting day $k, more than $spotcachedays days old"); + delete $spotcache{$k}; + } + } + } } 1;