projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix spotfilter
[spider.git]
/
perl
/
Spot.pm
diff --git
a/perl/Spot.pm
b/perl/Spot.pm
index 982f8db5e19b51dadcfe088adea403b969b58b23..796b5e9c9a678e90ab8a63002a55bd9cf576c51a 100644
(file)
--- a/
perl/Spot.pm
+++ b/
perl/Spot.pm
@@
-17,6
+17,7
@@
use Julian;
use Prefix;
use DXDupe;
use Data::Dumper;
use Prefix;
use DXDupe;
use Data::Dumper;
+use QSL;
use strict;
use strict;
@@
-26,7
+27,7
@@
$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ || (0,0))
$main::build += $VERSION;
$main::branch += $BRANCH;
$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;
$fp = undef;
$statp = undef;
@@
-101,8
+102,9
@@
sub init
mkdir "$dirprefix", 0777 if !-e "$dirprefix";
$fp = DXLog::new($dirprefix, "dat", 'd');
$statp = DXLog::new($dirprefix, "dys", 'd');
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
}
sub prefix
@@
-151,7
+153,7
@@
sub prepare
sub add
{
sub add
{
- my $buf = join("\^", @_
[0..7]
);
+ my $buf = join("\^", @_);
$fp->writeunix($_[2], $buf);
$totalspots++;
if ($_[0] <= 30000) {
$fp->writeunix($_[2], $buf);
$totalspots++;
if ($_[0] <= 30000) {
@@
-159,6
+161,10
@@
sub add
} else {
$vhfspots++;
}
} 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
}
# search the spot database for records based on the field no and an expression
@@
-188,7
+194,7
@@
sub add
sub search
{
sub search
{
- my ($expr, $dayfrom, $dayto, $from, $to, $hint) = @_;
+ my ($expr, $dayfrom, $dayto, $from, $to, $hint
, $dxchan
) = @_;
my $eval;
my @out;
my $ref;
my $eval;
my @out;
my $ref;
@@
-227,6
+233,22
@@
sub search
for (\$c = \$#spots; \$c >= 0; \$c--) {
\$ref = \$spots[\$c];
if ($expr) {
for (\$c = \$#spots; \$c >= 0; \$c--) {
\$ref = \$spots[\$c];
if ($expr) {
+ if (\$dxchan && \$dxchan->{spotsfilter}) {
+ if (\@\$ref < 9) {
+ my \@dxcc = Prefix::cty_data(\$ref->[1]);
+ if (\@dxcc) {
+ pop \@dxcc;
+ push \@\$ref, \@dxcc;
+ }
+ \@dxcc = Prefix::cty_data(\$ref->[4]);
+ if (\@dxcc) {
+ pop \@dxcc;
+ push \@\$ref, \@dxcc;
+ }
+ }
+ my (\$filter, \$hops) = \$dxchan->{spotsfilter}->it(\@\$ref);
+ next unless (\$filter);
+ }
\$count++;
next if \$count < \$from; # wait until from
push(\@out, \$ref);
\$count++;
next if \$count < \$from; # wait until from
push(\@out, \$ref);
@@
-234,6
+256,9
@@
sub search
}
}
);
}
}
);
+
+ dbg("Spot eval: $eval") if isdbg('searcheval');
+
$fp->close; # close any open files
$fp->close; # close any open files
@@
-312,7
+337,7
@@
sub readfile($)
# enter the spot for dup checking and return true if it is already a dup
sub dup
{
# 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;
# dump if too old
return 2 if $d < $main::systime - $dupage;
@@
-323,6
+348,11
@@
sub dup
$freq = sprintf "%.1f", $freq; # normalise frequency
$call = substr($call, 0, 12) if length $call > 12;
$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;
chomp $text;
$text =~ s/\%([0-9A-F][0-9A-F])/chr(hex($1))/eg;
$text = substr($text, 0, $duplth) if length $text > $duplth;
@@
-331,11
+361,14
@@
sub dup
$text =~ s/[^a-zA-Z0-9]//g;
for (-60, -120, -180, -240, 0, 60, 120, 180, 240, 300) {
my $dt = $d - $_;
$text =~ s/[^a-zA-Z0-9]//g;
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;
}
return 0;
}
@@
-361,6
+394,7
@@
sub genstats($)
my ($freq, $by, $dxcc) = (split /\^/)[0,4,6];
my $ref = $list{$by} || [0, $dxcc];
for (@freq) {
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]++;
if ($freq >= $_->[1] && $freq <= $_->[2]) {
$$ref[$_->[0]+2]++;
$tot[$_->[0]+2]++;