X-Git-Url: http://www.dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FSpot.pm;h=8f20a99952e8d28b47ce8179d9af32e9f42a968b;hb=6eb08c1c1d0ba36ac588053a40d6367f1b069ba1;hp=3bd74c4fdca77fa1c74baf9ac5a604c4aed415a6;hpb=07200f06b8a3f19ddccf471704a7bd5c1d554f0e;p=spider.git diff --git a/perl/Spot.pm b/perl/Spot.pm index 3bd74c4f..8f20a999 100644 --- a/perl/Spot.pm +++ b/perl/Spot.pm @@ -352,7 +352,7 @@ sub readfile($) # 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; @@ -369,8 +369,12 @@ sub dup 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 && is_prefix($prefix); + if ($cty && $text && length $text <= 4) { + unless ($text =~ /^CQ/ || $text =~ /^\d+$/) { + my @try = Prefix::cty_data($text); + $text = "" if $cty == $try[0]; + } + } $text = substr($text, 0, $duplth) if length $text > $duplth; $text = pack("C*", map {$_ & 127} unpack("C*", $text)); $text =~ s/[^\w]//g;