X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FSpot.pm;h=f59ef4f4965bca34c5b747d30c0c9b03390bfc5e;hb=8032b90ab5f686159bc725b43d28862c42ad55d5;hp=8b66b0f6c762f78c398c230a64856a7ae89a621a;hpb=db7747a775a39ec1828fc78b9442f301ed32b195;p=spider.git diff --git a/perl/Spot.pm b/perl/Spot.pm index 8b66b0f6..f59ef4f4 100644 --- a/perl/Spot.pm +++ b/perl/Spot.pm @@ -16,12 +16,21 @@ use DXLog; use Julian; use Prefix; use DXDupe; +use Data::Dumper; use strict; -use vars qw($fp $maxspots $defaultspots $maxdays $dirprefix $duplth $dupage $filterdef); + +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 = 100; # normal maximum no of days to go back $dirprefix = "spots"; @@ -34,16 +43,19 @@ $filterdef = bless ([ ['call', 'c', 1], ['info', 't', 3], ['by', 'c', 4], - ['call_dxcc', 'n', 5], - ['by_dxcc', 'n', 6], + ['call_dxcc', 'nc', 5], + ['by_dxcc', 'nc', 6], ['origin', 'c', 7, 9], - ['call_itu', 'n', 8], - ['call_zone', 'n', 9], - ['by_itu', 'n', 10], - ['by_zone', 'n', 11], - ['channel', 'n', 12, 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 @@ -88,6 +100,10 @@ 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 @@ -110,25 +126,40 @@ sub prepare # remove leading and trailing spaces $_[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, $_[5]; - return (@out, $spotted_itu, $spotted_cq, $spotter_itu, $spotter_cq); + return (@out, $spotted_itu, $spotted_cq, $spotter_itu, $spotter_cq, $spotted_state, $spotter_state); } sub add { my $buf = join("\^", @_[0..7]); $fp->writeunix($_[2], $buf); + $totalspots++; + if ($_[0] <= 30000) { + $hfspots++; + } else { + $vhfspots++; + } } # search the spot database for records based on the field no and an expression @@ -164,15 +195,15 @@ sub search 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 unless $dayto; $dayto = $dayfrom + $maxdays if $dayto < $dayfrom; - @fromdate = Julian::sub(@today, $dayfrom); - @todate = Julian::sub(@fromdate, $dayto); + $fromdate = $today->sub($dayfrom); + $todate = $fromdate->sub($dayto); $from = 0 unless $from; $to = $defaultspots unless $to; $hint = $hint ? "next unless $hint" : ""; @@ -183,7 +214,7 @@ sub search $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", "hint='$hint', 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( @@ -208,11 +239,11 @@ sub search $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; eval $eval; # do the search on this file @@ -240,7 +271,7 @@ sub ftor while (@b) { my $aa = shift @a; my $bb = shift @b; - if (@b < (length $d) - 1) { + if (@b < (length $d)) { $out .= '\\d'; } elsif ($aa eq $bb) { $out .= $aa; @@ -253,18 +284,6 @@ sub ftor return $out; } -# format a spot for user output in 'broadcast' mode -sub formatb -{ - 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 ; -} - # format a spot for user output in list mode sub formatl { @@ -276,11 +295,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>) { @@ -294,25 +313,107 @@ 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); - $text =~ s/[\\\%]\d+//g; + $text = pack("C*", map {$_ & 127} unpack("C*", $text)); $text =~ s/[^a-zA-Z0-9]//g; - my $dupkey = "X$freq|$call|$d|\L$text"; - return DXDupe::check($dupkey, $main::systime+$dupage); + 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; } sub listdups { return DXDupe::listdups('X', $dupage, @_); } + +sub genstats($) +{ + 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 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;