use Julian;
use Prefix;
use DXDupe;
+use Data::Dumper;
+use QSL;
use strict;
-use vars qw($fp $maxspots $defaultspots $maxdays $dirprefix $duplth $dupage $filterdef);
+
+use vars qw($VERSION $BRANCH);
+
+($VERSION, $BRANCH) = dxver(q$Revision$);
+
+use vars qw($fp $statp $maxspots $defaultspots $maxdays $dirprefix $duplth $dupage $filterdef $totalspots $hfspots $vhfspots $maxcalllth);
$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 = 3*31; # 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
+$dupage = 1*3600; # the length of time to hold spot dups
+$maxcalllth = 12; # the max length of call to take into account for dupes
$filterdef = bless ([
# tag, sort, field, priv, special parser
['freq', '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],
+ ['call_state', 'ns', 12],
+ ['by_state', 'ns', 13],
+ ['channel', 'c', 14],
+
], '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');
+
+ # load up any old spots
+ if ($main::dbh) {
+ unless (grep $_ eq 'spot', $main::dbh->show_tables) {
+ dbg('initialising spot tables');
+ my $t = time;
+ my $total;
+ $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;
+ $main::dbh->{RaiseError} = 0;
+ while ($now->cmp($today) <= 0) {
+ my $fh = $fp->open($now);
+ if ($fh) {
+ my $count = 0;
+ while (<$fh>) {
+ chomp;
+ my @s = split /\^/;
+ if (@s < 12) {
+ 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], $a[2] if @s < 14;
+ }
+
+ push @s, undef while @s < 14;
+ pop @s while @s > 14;
+
+ $main::dbh->spot_insert(\@s, $sth);
+ $count++;
+ }
+ $main::dbh->commit if $count;
+ $main::dbh->{RaiseError} = 0;
+ dbg("inserted $count spots from $now->[0] $now->[1]");
+ $fh->close;
+ $total += $count;
+ }
+ $now = $now->add(1);
+ }
+ $main::dbh->spot_add_indexes;
+ $main::dbh->commit;
+ $main::dbh->{RaiseError} = 1;
+ $t = time - $t;
+ my $min = int($t / 60);
+ my $sec = $t % 60;
+ dbg("$total spots converted in $min:$sec");
+ }
+ }
}
sub prefix
my @out = @_[0..4]; # just up to the spotter
# normalise frequency
- $_[0] = sprintf "%.f", $_[0];
+ $out[0] = sprintf "%.1f", $out[0];
- # remove ssids if present on spotter
+ # remove ssids and /xxx if present on spotter
$out[4] =~ s/-\d+$//o;
# remove leading and trailing spaces
- $_[3] = unpad($_[3]);
+ $out[3] = unpad($out[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_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_itu = (@dxcc > 0 ) ? $dxcc[1]->itu() : 0;
- my $spotter_cq = (@dxcc > 0 ) ? $dxcc[1]->cq() : 0;
- push @out, $spotter_dxcc;
+ my @spd = Prefix::cty_data($out[1]);
+ push @out, $spd[0];
+ my @spt = Prefix::cty_data($out[4]);
+ push @out, $spt[0];
push @out, $_[5];
- return (@out, $spotted_itu, $spotted_cq, $spotter_itu, $spotter_cq);
+ return (@out, @spd[1,2], @spt[1,2], $spd[3], $spt[3]);
}
sub add
{
- my $buf = join("\^", @_[0..7]);
+ my $buf = join('^', @_);
$fp->writeunix($_[2], $buf);
+ if ($main::dbh) {
+ $main::dbh->spot_insert(\@_);
+ $main::dbh->commit;
+ }
+ $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
sub search
{
- my ($expr, $dayfrom, $dayto, $from, $to, $hint) = @_;
+ my ($expr, $dayfrom, $dayto, $from, $to, $hint, $dxchan) = @_;
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" : "";
$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
+ if ($main::dbh) {
+ return $main::dbh->spot_search($expr, $dayfrom, $dayto, $to-$from, $dxchan);
+ }
+
+ $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
- dbg("search", "hint='$hint', expr='$expr', spotno=$from-$to, day=$dayfrom-$dayto\n");
+ 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');
# build up eval to execute
$eval = qq(
while (<\$fh>) {
$hint;
chomp;
- push \@spots, [ split '\\^' ];
+ my \@s = split /\\^/;
+ $checkfilter;
+ push \@spots, \\\@s;
}
my \$c;
my \$ref;
}
}
);
+
+ 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;
eval $eval; # do the search on this file
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;
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
{
my $t = ztime($_[2]);
my $d = cldate($_[2]);
- return sprintf "%8.1f %-11s %s %s %-28.28s%7s>", $_[0], $_[1], $d, $t, $_[3], "<$_[4]" ;
+ 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
+sub readfile($)
{
my @spots;
- my $fh = $fp->open(@_);
+ my $fh = $fp->open(shift);
if ($fh) {
my $in;
while (<$fh>) {
# 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, $cty) = @_;
# dump if too old
return 2 if $d < $main::systime - $dupage;
-
- $freq = sprintf "%.1f", $freq; # normalise frequency
+
+ # turn the time into minutes (should be already but...)
+ $d = int ($d / 60);
+ $d *= 60;
+
+ # remove SSID or area
+ $by =~ s|[-/]\d+$||;
+
+# $freq = sprintf "%.1f", $freq; # normalise frequency
+ $freq = int $freq; # normalise frequency
+ $call = substr($call, 0, $maxcalllth) if length $call > $maxcalllth;
+
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+$/) {
+ my @try = Prefix::cty_data($text);
+ $text = "" if $cty == $try[0];
+ }
+ }
+ my $otext = $text;
+ $text =~ s/^\+\w+\s*//; # remove leading LoTW callsign
+ $text = pack("C*", map {$_ & 127} unpack("C*", $text));
+ $text =~ s/\s{2,}[\dA-Z]?[A-Z]\d?$// if length $text > 24;
+ $text =~ s/[^\w]//g;
$text = substr($text, 0, $duplth) if length $text > $duplth;
- unpad($text);
- $text =~ s/[\\\%]\d+//g;
- $text =~ s/[^a-zA-Z0-9]//g;
- my $dupkey = "X$freq|$call|$d|\L$text";
- return DXDupe::check($dupkey, $main::systime+$dupage);
+ my $ldupkey = "X$freq|$call|$by|$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+$//;
+ if (length $otext && $otext ne $text) {
+ $ldupkey = "X$freq|$call|$by|$otext";
+ $t = DXDupe::find($ldupkey);
+ return 1 if $t && $t - $main::systime > 0;
+ DXDupe::add($ldupkey, $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;
projects / spider.git / blobdiff