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 = 35; # normal maximum no of days to go back
+$maxdays = 100; # normal maximum no of days to go back
$dirprefix = "spots";
$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', '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],
+ ['channel', 'c', 12],
], 'Filter::Cmd');
-
+$totalspots = $hfspots = $vhfspots = 0;
# create a Spot Object
sub new
{
mkdir "$dirprefix", 0777 if !-e "$dirprefix";
$fp = DXLog::new($dirprefix, "dat", 'd');
+ $statp = DXLog::new($dirprefix, "dys", 'd');
+ system("rm -f $main::data/$dirprefix/200?/*.bys");
+ system("rm -f $main::data/$dirprefix/200?/*.cys");
}
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]);
# 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_dxcc = (@dxcc > 0 ) ? $dxcc[1]->dxcc() : 666;
my $spotted_itu = (@dxcc > 0 ) ? $dxcc[1]->itu() : 0;
my $spotted_cq = (@dxcc > 0 ) ? $dxcc[1]->cq() : 0;
push @out, $spotted_dxcc;
@dxcc = Prefix::extract($out[4]);
- my $spotter_dxcc = (@dxcc > 0 ) ? $dxcc[1]->dxcc() : 0;
+ my $spotter_dxcc = (@dxcc > 0 ) ? $dxcc[1]->dxcc() : 666;
my $spotter_itu = (@dxcc > 0 ) ? $dxcc[1]->itu() : 0;
my $spotter_cq = (@dxcc > 0 ) ? $dxcc[1]->cq() : 0;
push @out, $spotter_dxcc;
- push @out, $spot[5];
-
- my $buf = join("\^", @out);
-
- # 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);
-
+ push @out, $_[5];
return (@out, $spotted_itu, $spotted_cq, $spotter_itu, $spotter_cq);
}
+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
# this returns a set of references to the spots
#
sub search
{
- my ($expr, $dayfrom, $dayto, $from, $to) = @_;
+ my ($expr, $dayfrom, $dayto, $from, $to, $hint) = @_;
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--) {
$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 $@;
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
#
# 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>) {
# 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;
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 = pack("C*", map {$_ & 127} unpack("C*", $text));
$text =~ s/[^a-zA-Z0-9]//g;
+ for (0,60,120,180,240,300) {
+ my $dt = $d - $_;
+ my $dupkey = "X$freq|$call|$dt|\L$text";
+ return 1 if DXDupe::find($dupkey);
+ }
my $dupkey = "X$freq|$call|$d|\L$text";
- return DXDupe::check($dupkey, $main::systime+$dupage);
+ DXDupe::add($dupkey, $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) {
+ 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;