$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 $maxcalllth);
$fp = undef;
$statp = undef;
$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],
mkdir "$dirprefix", 0777 if !-e "$dirprefix";
$fp = DXLog::new($dirprefix, "dat", 'd');
$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
# 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]);
- 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]);
- 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]);
- 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;
+ 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, $spotted_state, $spotter_state);
+ return (@out, @spd[1,2], @spt[1,2], $spd[3], $spt[3]);
}
sub add
{
- my $buf = join("\^", @_);
+ my $buf = join('^', @_);
$fp->writeunix($_[2], $buf);
$totalspots++;
if ($_[0] <= 30000) {
$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];
+ } 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
while (<\$fh>) {
$hint;
chomp;
- push \@spots, [ split '\\^' ];
+ my \@s = split /\\^/;
+ $checkfilter;
+ push \@spots, \\\@s;
}
my \$c;
my \$ref;
for (\$c = \$#spots; \$c >= 0; \$c--) {
\$ref = \$spots[\$c];
if ($expr) {
- if (\$dxchan && \$dxchan->{inspotsfilter}) {
- 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->{inspotsfilter}->it(\@\$ref);
- next unless (\$filter);
- }
\$count++;
next if \$count < \$from; # wait until from
push(\@out, \$ref);
# enter the spot for dup checking and return true if it is already a dup
sub dup
{
- my ($freq, $call, $d, $text, $by) = @_;
+ my ($freq, $call, $d, $text, $by, $cty) = @_;
# dump if too old
return 2 if $d < $main::systime - $dupage;
$d = int ($d / 60);
$d *= 60;
+ # remove SSID or area
+ $by =~ s|[-/]\d+$||;
+
$freq = sprintf "%.1f", $freq; # normalise frequency
- $call = substr($call, 0, 12) if length $call > 12;
+ $call = substr($call, 0, $maxcalllth) if length $call > $maxcalllth;
- # 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 (-60, -120, -180, -240, 0, 60, 120, 180, 240, 300) {
- my $dt = $d - $_;
- my $ldupkey = "X$freq|$call|$dt|\L$text";
- my $sdupkey = "X$freq|$call|$dt|$by";
- return 1 if DXDupe::find($ldupkey) || DXDupe::find($sdupkey);
+ $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 $ldupkey = "X$freq|$call|$d|\L$text";
- $sdupkey = "X$freq|$call|$d|$by";
+ my $otext = $text;
+ $text = pack("C*", map {$_ & 127} unpack("C*", $text));
+ $text =~ s/[^\w]//g;
+ $text = substr($text, 0, $duplth) if length $text > $duplth;
+ 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);
- DXDupe::add($sdupkey, $main::systime+$dupage);
+ $otext = substr($otext, 0, $duplth) if length $otext > $duplth;
+ 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);
+ }
+# 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;
}
projects / spider.git / blobdiff