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;
+$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);
+use vars qw($fp $statp $maxspots $defaultspots $maxdays $dirprefix $duplth $dupage $filterdef $totalspots $hfspots $vhfspots );
$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
$dirprefix = "spots";
['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');
+ my $rm = $main::is_win ? 'del' : 'rm -f';
+ system("$rm $main::data/$dirprefix/*/*.bys");
+ system("$rm $main::data/$dirprefix/*/*.cys");
}
sub prefix
# 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() : 666;
- 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() : 666;
- 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]);
+ 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, $dofilter) = @_;
my $eval;
my @out;
my $ref;
for (\$c = \$#spots; \$c >= 0; \$c--) {
\$ref = \$spots[\$c];
if ($expr) {
+ if (\$dofilter && \$self->{inspotsfilter}) {
+ if (\@\$spot < 9) {
+ my i\@dxcc = Prefix::cty_data(\$spot->[1]);
+ if (\@dxcc) {
+ pop \@dxcc;
+ push \@\$spot, \@dxcc;
+ }
+ \@dxcc = Prefix::cty_data(\$spot->[4]);
+ if (\@dxcc) {
+ pop \@dxcc;
+ push \@\$spot, \@dxcc;
+ }
+ }
+ my (\$filter, \$hops) = \$self->{inspotsfilter}->it(\@\$spot);
+ next unless (\$filter);
+ }
\$count++;
next if \$count < \$from; # wait until from
push(\@out, \$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
-{
- 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
{
# 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 = 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 $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;
}
projects / spider.git / blobdiff