X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FSpot.pm;h=d14e310eefdff0ef3a35dc1d0cd988902b98d5dd;hb=7cc498cbcff1c351c3780782822c1402ab634b81;hp=99f0c83ed743934216698b7149ddff59b1647240;hpb=70d6fc010dd321598034d08907d3dfc98414cfca;p=spider.git diff --git a/perl/Spot.pm b/perl/Spot.pm index 99f0c83e..d14e310e 100644 --- a/perl/Spot.pm +++ b/perl/Spot.pm @@ -209,6 +209,9 @@ sub search 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); @@ -328,6 +331,9 @@ sub dup $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; @@ -335,18 +341,26 @@ sub dup $text =~ s/\%([0-9A-F][0-9A-F])/chr(hex($1))/eg; $text = uc unpad($text); if ($cty && $text && length $text <= 4) { - unless ($text =~ /^CQ/ || $text =~ /^\d+$/) { + 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; + 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); + $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;