use Prefix;
use DXDupe;
use Data::Dumper;
+use QSL;
use strict;
$main::build += $VERSION;
$main::branch += $BRANCH;
-use vars qw($fp $statp $maxspots $defaultspots $maxdays $dirprefix $duplth $dupage $filterdef $totalspots $hfspots $vhfspots);
+use vars qw($fp $statp $maxspots $defaultspots $maxdays $dirprefix $duplth $dupage $filterdef $totalspots $hfspots $vhfspots );
$fp = undef;
$statp = undef;
['call_zone', 'nz', 9],
['by_itu', 'ni', 10],
['by_zone', 'nz', 11],
- ['channel', 'c', 12],
+ ['call_state', 'ns', 12],
+ ['by_state', 'ns', 13],
+ ['channel', 'c', 14],
+
], 'Filter::Cmd');
$totalspots = $hfspots = $vhfspots = 0;
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");
+ my $rm = $main::is_win ? 'del' : 'rm -f';
+ system("$rm $main::data/$dirprefix/*/*.bys");
+ system("$rm $main::data/$dirprefix/*/*.cys");
}
sub prefix
# normalise frequency
$_[0] = sprintf "%.1f", $_[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]);
+
# 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() : 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() : 666;
- 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);
$totalspots++;
if ($_[0] <= 30000) {
} 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;
$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\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
+ 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];
+ }
+ 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
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
# 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;
$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 = pack("C*", map {$_ & 127} unpack("C*", $text));
$text =~ s/[^a-zA-Z0-9]//g;
- for (0,60,120,180,240,300) {
+ for (-60, -120, -180, -240, 0, 60, 120, 180, 240, 300) {
my $dt = $d - $_;
- my $dupkey = "X$freq|$call|$dt|\L$text";
- return 1 if DXDupe::find($dupkey);
+ 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 $dupkey = "X$freq|$call|$d|\L$text";
- DXDupe::add($dupkey, $main::systime+$dupage);
+ 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;
}
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]++;