$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
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);
# 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, $maxcalllth) if length $call > $maxcalllth;
chomp $text;
$text =~ s/\%([0-9A-F][0-9A-F])/chr(hex($1))/eg;
$text = uc unpad($text);
- my ($prefix) = $text =~ /\b(\w{1,4})$/;
- $text =~ s/\b\w{1,4}$// if $prefix && Prefix::extract($prefix);
+ if ($cty && $text && length $text <= 4) {
+ unless ($text =~ /^C?Q/ || $text =~ /^\d+$/) {
+ my @try = Prefix::cty_data($text);
+ $text = "" if $cty == $try[0];
+ }
+ }
$text = substr($text, 0, $duplth) if length $text > $duplth;
+ $text =~ s/\s+$//;
+ my $otext = $text;
$text = pack("C*", map {$_ & 127} unpack("C*", $text));
$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);
+ 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);
+ }
return 0;
}