use Prefix;
use DXDupe;
use Data::Dumper;
+use QSL;
use strict;
use vars qw($VERSION $BRANCH);
-$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ ) || 0;
-$main::build += $VERSION;
-$main::branch += $BRANCH;
-use vars qw($fp $statp $maxspots $defaultspots $maxdays $dirprefix $duplth $dupage $filterdef);
+main::mkver($VERSION = q$Revision$);
+
+use vars qw($fp $statp $maxspots $defaultspots $maxdays $dirprefix $duplth $dupage $filterdef $totalspots $hfspots $vhfspots $maxcalllth );
$fp = undef;
$statp = undef;
-$maxspots = 50; # maximum spots to return
+$maxspots = 100; # maximum spots to return
$defaultspots = 10; # normal number of spots to return
-$maxdays = 100; # 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 = 3600; # the length of time to hold spot dups
+$maxcalllth = 12; # the maximum call lth
+
$filterdef = bless ([
# tag, sort, field, priv, special parser
['freq', 'r', 0, 0, \&decodefreq],
['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;
# create a Spot Object
sub new
{
mkdir "$dirprefix", 0777 if !-e "$dirprefix";
$fp = DXLog::new($dirprefix, "dat", 'd');
- $statp = DXLog::new($dirprefix, "cys", 'd');
- system("rm -f $main::data/$dirprefix/2001/*.bys");
+ $statp = DXLog::new($dirprefix, "dys", 'd');
}
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]);
+ $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() : 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) {
+ $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;
$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
return $out;
}
-# format a spot for user output in 'broadcast' mode
-sub formatb
+# format a spot for user output in list mode
+sub formatl
{
- 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 %-29s %s$loc", "$_[4]:", $_[0], $_[1], $_[3], $t ;
+ my $spot = ref $_[0] ? shift : \@_;
+
+ my $t = ztime($spot->[2]);
+ my $d = cldate($spot->[2]);
+ return sprintf "%8.1f %-11s %s %s %-28.28s%7s>", $spot->[0], $spot->[1], $d, $t, $spot->[3], "<$spot->[4]" ;
}
-# format a spot for user output in list mode
-sub formatl
+# format a spot for normal output
+sub format_dx_spot
{
- my $t = ztime($_[2]);
- my $d = cldate($_[2]);
- return sprintf "%8.1f %-11s %s %s %-28.28s%7s>", $_[0], $_[1], $d, $t, $_[3], "<$_[4]" ;
+ my $dxchan = shift;
+ my $spot = ref $_[0] ? shift : \@_;
+
+ my $t = ztime($spot->[2]);
+ my $loc = '';
+ my $clth = $dxchan->{consort} eq 'local' ? 29 : 30;
+ my $comment = substr $spot->[3], 0, $clth;
+ $comment .= ' ' x ($clth - length($comment));
+ if ($dxchan->{user}->wantgrid) {
+ my $ref = DXUser->get_current($spot->[4]);
+ if ($ref) {
+ $loc = $ref->qra || '';
+ $loc = ' ' . substr($loc, 0, 4) if $loc;
+ }
+ }
+
+ if ($dxchan->{user}->wantdxitu) {
+ $loc = ' ' . sprintf("%2d", $spot->[10]) if defined $spot->[10];
+ $comment = substr($comment, 0, $dxchan->{consort} eq 'local' ? 26 : 27) . ' ' . sprintf("%2d", $spot->[8]) if defined $spot->[8];
+ } elsif ($dxchan->{user}->wantdxcq) {
+ $loc = ' ' . sprintf("%2d", $spot->[11]) if defined $spot->[11];
+ $comment = substr($comment, 0, $dxchan->{consort} eq 'local' ? 26 : 27) . ' ' . sprintf("%2d", $spot->[9]) if defined $spot->[9];
+ } elsif ($dxchan->{user}->wantusstate) {
+ $loc = ' ' . $spot->[13] if $spot->[13];
+ $comment = substr($comment, 0, $dxchan->{consort} eq 'local' ? 26 : 27) . ' ' . $spot->[12] if $spot->[12];
+ }
+
+ return sprintf "DX de %-7.7s%11.1f %-12.12s %-s $t$loc", "$spot->[4]:", $spot->[0], $spot->[1], $comment;
}
#
# 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;
+
+ $by =~ s/-\d+$//g;
+
$freq = sprintf "%.1f", $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 = substr($text, 0, $duplth) if length $text > $duplth;
- unpad($text);
+ $text = uc unpad($text);
+ my ($prefix) = $text =~ /\b(\w{1,4})$/;
+ $text =~ s/\b\w{1,4}$// if $prefix && is_prefix($prefix);
+ $text = substr($text, 0, $duplth) if length $text > $duplth;
$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";
- DXDupe::add($dupkey, $main::systime+$dupage);
+ $text =~ s/[^\w]//g;
+ 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);
+# my $sdupkey = "X$freq|$call|$by";
+# $t = DXDupe::find($sdupkey);
+# return 1 if $t && $t - $main::systime > 0;
+# DXDupe::add($sdupkey, $main::systime+$dupage);
return 0;
}
my $date = shift;
my $in = $fp->open($date);
my $out = $statp->open($date, 'w');
- my @freq = (
- [0, Bands::get_freq('160m')],
- [1, Bands::get_freq('80m')],
- [2, Bands::get_freq('40m')],
- [3, Bands::get_freq('30m')],
- [4, Bands::get_freq('20m')],
- [5, Bands::get_freq('17m')],
- [6, Bands::get_freq('15m')],
- [7, Bands::get_freq('12m')],
- [8, Bands::get_freq('10m')],
- [9, Bands::get_freq('6m')],
- [10, Bands::get_freq('4m')],
- [11, Bands::get_freq('2m')],
- [12, Bands::get_freq('220')],
- [13, Bands::get_freq('70cm')],
- [14, Bands::get_freq('23cm')],
- [15, Bands::get_freq('13cm')],
- [16, Bands::get_freq('9cm')],
- [17, Bands::get_freq('6cm')],
- [18, Bands::get_freq('3cm')],
- [19, Bands::get_freq('12mm')],
- [20, Bands::get_freq('6cm')],
- );
+ 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]++;
}
}
- my $i;
for ($i = 0; $i < @freq+2; $i++) {
$tot[$i] ||= 0;
}