X-Git-Url: http://www.dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FSpot.pm;h=08190186ed34a869d16e845926621b4b79184590;hb=df49d2cf8efcb2b6becf241379700f363a7014df;hp=1e7de69a7b32a5f9dbe8ab2651528143984fb801;hpb=261c75481017f32ca491df475b36e9600ca430a1;p=spider.git diff --git a/perl/Spot.pm b/perl/Spot.pm index 1e7de69a..08190186 100644 --- a/perl/Spot.pm +++ b/perl/Spot.pm @@ -15,23 +15,96 @@ use DXUtil; use DXLog; use Julian; use Prefix; +use DXDupe; +use Data::Dumper; +use QSL; use strict; -use vars qw($fp $maxspots $defaultspots $maxdays $dirprefix %dup $duplth $dupage); + +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($fp $statp $maxspots $defaultspots $maxdays $dirprefix $duplth $dupage $filterdef $totalspots $hfspots $vhfspots ); $fp = undef; -$maxspots = 50; # maximum spots to return +$statp = undef; +$maxspots = 100; # maximum spots to return $defaultspots = 10; # normal number of spots to return -$maxdays = 35; # normal maximum no of days to go back +$maxdays = 100; # normal maximum no of days to go back $dirprefix = "spots"; -%dup = (); # the spot duplicates hash $duplth = 20; # the length of text to use in the deduping $dupage = 3*3600; # the length of time to hold spot dups +$filterdef = bless ([ + # tag, sort, field, priv, special parser + ['freq', 'r', 0, 0, \&decodefreq], + ['on', 'r', 0, 0, \&decodefreq], + ['call', 'c', 1], + ['info', 't', 3], + ['by', 'c', 4], + ['call_dxcc', 'nc', 5], + ['by_dxcc', 'nc', 6], + ['origin', 'c', 7, 9], + ['call_itu', 'ni', 8], + ['call_zone', 'nz', 9], + ['by_itu', 'ni', 10], + ['by_zone', 'nz', 11], + ['call_state', 'ns', 12], + ['by_state', 'ns', 13], + ['channel', 'c', 14], + + ], 'Filter::Cmd'); +$totalspots = $hfspots = $vhfspots = 0; + +# create a Spot Object +sub new +{ + my $class = shift; + my $self = [ @_ ]; + return bless $self, $class; +} + +sub decodefreq +{ + my $dxchan = shift; + my $l = shift; + my @f = split /,/, $l; + my @out; + my $f; + + foreach $f (@f) { + my ($a, $b); + if (m{^\d+/\d+$}) { + push @out, $f; + } elsif (($a, $b) = $f =~ m{^(\w+)(?:/(\w+))?$}) { + $b = lc $b if $b; + my @fr = Bands::get_freq(lc $a, $b); + if (@fr) { + while (@fr) { + $a = shift @fr; + $b = shift @fr; + push @out, "$a/$b"; # add them as ranges + } + } else { + return ('dfreq', $dxchan->msg('dfreq1', $f)); + } + } else { + return ('dfreq', $dxchan->msg('e20', $f)); + } + } + return (0, join(',', @out)); +} sub init { mkdir "$dirprefix", 0777 if !-e "$dirprefix"; $fp = DXLog::new($dirprefix, "dat", 'd'); + $statp = DXLog::new($dirprefix, "dys", 'd'); + my $rm = $main::is_win ? 'del' : 'rm -f'; + system("$rm $main::data/$dirprefix/*/*.bys"); + system("$rm $main::data/$dirprefix/*/*.cys"); } sub prefix @@ -39,41 +112,59 @@ sub prefix return $fp->{prefix}; } -# add a spot to the data file (call as Spot::add) -sub add +# fix up the full spot data from the basic spot data +sub prepare { - my @spot = @_; # $freq, $call, $t, $comment, $spotter = @_ - my @out = @spot[0..4]; # just up to the spotter + # $freq, $call, $t, $comment, $spotter = @_ + my @out = @_[0..4]; # just up to the spotter # normalise frequency - $spot[0] = sprintf "%.f", $spot[0]; + $_[0] = sprintf "%.1f", $_[0]; # remove ssids if present on spotter $out[4] =~ s/-\d+$//o; # remove leading and trailing spaces - $spot[3] = unpad($spot[3]); + $_[3] = unpad($_[3]); + + my ($spotted_dxcc, $spotted_itu, $spotted_cq, $spotted_state) = (666, 0, 0, ""); + my ($spotter_dxcc, $spotter_itu, $spotter_cq, $spotter_state) = (666, 0, 0, ""); # add the 'dxcc' country on the end for both spotted and spotter, then the cluster call my @dxcc = Prefix::extract($out[1]); - my $spotted_dxcc = (@dxcc > 0 ) ? $dxcc[1]->dxcc() : 0; - my $spotted_itu = (@dxcc > 0 ) ? $dxcc[1]->itu() : 0; - my $spotted_cq = (@dxcc > 0 ) ? $dxcc[1]->cq() : 0; + if (@dxcc) { + $spotted_dxcc = $dxcc[1]->dxcc(); + $spotted_itu = $dxcc[1]->itu(); + $spotted_cq = $dxcc[1]->cq(); + $spotted_state = $dxcc[1]->state(); + } push @out, $spotted_dxcc; @dxcc = Prefix::extract($out[4]); - my $spotter_dxcc = (@dxcc > 0 ) ? $dxcc[1]->dxcc() : 0; - my $spotter_itu = (@dxcc > 0 ) ? $dxcc[1]->itu() : 0; - my $spotter_cq = (@dxcc > 0 ) ? $dxcc[1]->cq() : 0; + if (@dxcc) { + $spotter_dxcc = $dxcc[1]->dxcc(); + $spotter_itu = $dxcc[1]->itu(); + $spotter_cq = $dxcc[1]->cq(); + $spotter_state = $dxcc[1]->state(); + } push @out, $spotter_dxcc; - push @out, $spot[5]; - - my $buf = join("\^", @out); + push @out, $_[5]; + return (@out, $spotted_itu, $spotted_cq, $spotter_itu, $spotter_cq, $spotted_state, $spotter_state); +} - # compare dates to see whether need to open another save file (remember, redefining $fp - # automagically closes the output file (if any)). - $fp->writeunix($out[2], $buf); - - return (@out, $spotted_itu, $spotted_cq, $spotter_itu, $spotter_cq); +sub add +{ + my $buf = join("\^", @_); + $fp->writeunix($_[2], $buf); + $totalspots++; + if ($_[0] <= 30000) { + $hfspots++; + } else { + $vhfspots++; + } + if ($_[3] =~ /(?:QSL|VIA)/i) { + my $q = QSL::get($_[1]) || new QSL $_[1]; + $q->update($_[3], $_[2], $_[4]); + } } # search the spot database for records based on the field no and an expression @@ -103,37 +194,61 @@ sub add sub search { - my ($expr, $dayfrom, $dayto, $from, $to) = @_; + my ($expr, $dayfrom, $dayto, $from, $to, $hint, $dofilter) = @_; my $eval; my @out; my $ref; my $i; my $count; - my @today = Julian::unixtoj(time()); - my @fromdate; - my @todate; + my $today = Julian::Day->new(time()); + my $fromdate; + my $todate; $dayfrom = 0 if !$dayfrom; - $dayto = $maxdays if !$dayto; - @fromdate = Julian::sub(@today, $dayfrom); - @todate = Julian::sub(@fromdate, $dayto); + $dayto = $maxdays unless $dayto; + $dayto = $dayfrom + $maxdays if $dayto < $dayfrom; + $fromdate = $today->sub($dayfrom); + $todate = $fromdate->sub($dayto); $from = 0 unless $from; $to = $defaultspots unless $to; + $hint = $hint ? "next unless $hint" : ""; + $expr = "1" unless $expr; $to = $from + $maxspots if $to - $from > $maxspots || $to - $from <= 0; $expr =~ s/\$f(\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 - dbg("search", "expr='$expr', spotno=$from-$to, day=$dayfrom-$dayto\n"); + dbg("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; + push \@spots, [ split '\\^' ]; + } my \$c; my \$ref; for (\$c = \$#spots; \$c >= 0; \$c--) { \$ref = \$spots[\$c]; if ($expr) { + if (\$dofilter && \$self->{inspotsfilter}) { + if (\@\$spot < 9) { + my i\@dxcc = Prefix::cty_data(\$spot->[1]); + if (\@dxcc) { + pop \@dxcc; + push \@\$spot, \@dxcc; + } + \@dxcc = Prefix::cty_data(\$spot->[4]); + if (\@dxcc) { + pop \@dxcc; + push \@\$spot, \@dxcc; + } + } + my (\$filter, \$hops) = \$self->{inspotsfilter}->it(\@\$spot); + next unless (\$filter); + } \$count++; next if \$count < \$from; # wait until from push(\@out, \$ref); @@ -141,21 +256,20 @@ sub search } } ); + + dbg("Spot eval: $eval") if isdbg('searcheval'); + $fp->close; # close any open files for ($i = $count = 0; $i < $maxdays; ++$i) { # look thru $maxdays worth of files only - my @now = Julian::sub(@fromdate, $i); # but you can pick which $maxdays worth - last if Julian::cmp(@now, @todate) <= 0; + my $now = $fromdate->sub($i); # but you can pick which $maxdays worth + last if $now->cmp($todate) <= 0; my @spots = (); - my $fh = $fp->open(@now); # get the next file + my $fh = $fp->open($now); # get the next file if ($fh) { my $in; - while (<$fh>) { - chomp; - push @spots, [ split '\^' ]; - } eval $eval; # do the search on this file last if $count >= $to; # stop after to return ("Spot search error", $@) if $@; @@ -165,16 +279,33 @@ sub search return @out; } -# format a spot for user output in 'broadcast' mode -sub formatb +# change a freq range->regular expression +sub ftor { - my $wantgrid = shift; - my $t = ztime($_[2]); - my $ref = DXUser->get_current($_[4]); - my $loc = $ref->qra if $ref && $ref->qra && $wantgrid; - $loc = ' ' . substr($ref->qra, 0, 4) if $loc; - $loc = "" unless $loc; - return sprintf "DX de %-7.7s%11.1f %-12.12s %-30s %s$loc", "$_[4]:", $_[0], $_[1], $_[3], $t ; + my ($a, $b) = @_; + return undef unless $a < $b; + $b--; + my $d = $b - $a; + my @a = split //, $a; + my @b = split //, $b; + my $out; + while (@b > @a) { + $out .= shift @b; + } + while (@b) { + my $aa = shift @a; + my $bb = shift @b; + if (@b < (length $d)) { + $out .= '\\d'; + } elsif ($aa eq $bb) { + $out .= $aa; + } elsif ($aa < $bb) { + $out .= "[$aa-$bb]"; + } else { + $out .= "[0-$bb$aa-9]"; + } + } + return $out; } # format a spot for user output in list mode @@ -188,11 +319,11 @@ sub formatl # # return all the spots from a day's file as an array of references # the parameter passed is a julian day -sub readfile +sub readfile($) { my @spots; - my $fh = $fp->open(@_); + my $fh = $fp->open(shift); if ($fh) { my $in; while (<$fh>) { @@ -206,41 +337,106 @@ sub readfile # enter the spot for dup checking and return true if it is already a dup sub dup { - my ($freq, $call, $d, $text) = @_; + my ($freq, $call, $d, $text, $by) = @_; # dump if too old return 2 if $d < $main::systime - $dupage; - + + # turn the time into minutes (should be already but...) + $d = int ($d / 60); + $d *= 60; + $freq = sprintf "%.1f", $freq; # normalise frequency + $call = substr($call, 0, 12) if length $call > 12; + + # quick test now for simple case + my $sdupkey = "X$freq|$call|$d|$by"; + return 1 if DXDupe::find($sdupkey); + chomp $text; + $text =~ s/\%([0-9A-F][0-9A-F])/chr(hex($1))/eg; $text = substr($text, 0, $duplth) if length $text > $duplth; unpad($text); - my $dupkey = "$freq|$call|$d|$text"; - return 1 if exists $dup{$dupkey}; - $dup{$dupkey} = $d; # in seconds (to the nearest minute) - return 0; + $text = pack("C*", map {$_ & 127} unpack("C*", $text)); + $text =~ s/[^a-zA-Z0-9]//g; + for (-60, -120, -180, -240, 0, 60, 120, 180, 240, 300) { + my $dt = $d - $_; + my $ldupkey = "X$freq|$call|$dt|\L$text"; + my $sdupkey = "X$freq|$call|$dt|$by"; + return 1 if DXDupe::find($ldupkey) || DXDupe::find($sdupkey); + } + my $ldupkey = "X$freq|$call|$d|\L$text"; + $sdupkey = "X$freq|$call|$d|$by"; + DXDupe::add($ldupkey, $main::systime+$dupage); + DXDupe::add($sdupkey, $main::systime+$dupage); + return 0; } -# called every hour and cleans out the dup cache -sub process +sub listdups { - my $cutoff = $main::systime - $dupage; - while (my ($key, $val) = each %dup) { - delete $dup{$key} if $val < $cutoff; - } + return DXDupe::listdups('X', $dupage, @_); } -sub listdups +sub genstats($) { - my $regex = shift; - $regex = '.*' unless $regex; - $regex =~ s/[\$\@\%]//g; - my @out; - for (sort { $dup{$a} <=> $dup{$b} } grep { m{$regex}i } keys %dup) { - my $val = $dup{$_}; - push @out, "$_ = " . cldatetime($val); + my $date = shift; + my $in = $fp->open($date); + my $out = $statp->open($date, 'w'); + my @freq; + my %list; + my @tot; + + if ($in && $out) { + my $i = 0; + @freq = map {[$i++, Bands::get_freq($_)]} qw(136khz 160m 80m 60m 40m 30m 20m 17m 15m 12m 10m 6m 4m 2m 220 70cm 23cm 13cm 9cm 6cm 3cm 12mm 6mm); + while (<$in>) { + chomp; + my ($freq, $by, $dxcc) = (split /\^/)[0,4,6]; + my $ref = $list{$by} || [0, $dxcc]; + for (@freq) { + next unless defined $_; + if ($freq >= $_->[1] && $freq <= $_->[2]) { + $$ref[$_->[0]+2]++; + $tot[$_->[0]+2]++; + $$ref[0]++; + $tot[0]++; + $list{$by} = $ref; + last; + } + } + } + + for ($i = 0; $i < @freq+2; $i++) { + $tot[$i] ||= 0; + } + $statp->write($date, join('^', 'TOTALS', @tot)); + + for (sort {$list{$b}->[0] <=> $list{$a}->[0]} keys %list) { + my $ref = $list{$_}; + my $call = $_; + for ($i = 0; $i < @freq+2; ++$i) { + $ref->[$i] ||= 0; + } + $statp->write($date, join('^', $call, @$ref)); + } + $statp->close; } - return @out; +} + +# return true if the stat file is newer than than the spot file +sub checkstats($) +{ + my $date = shift; + my $in = $fp->mtime($date); + my $out = $statp->mtime($date); + return defined $out && defined $in && $out >= $in; +} + +# daily processing +sub daily +{ + my $date = Julian::Day->new($main::systime)->sub(1); + genstats($date) unless checkstats($date); } 1;