X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FSpot.pm;h=3bd74c4fdca77fa1c74baf9ac5a604c4aed415a6;hb=809ac2e606559d68ff6e0580c0681fc71c6bc4b9;hp=53f98fa66900808c7f9d77ee0b623c7a10b4555f;hpb=9cb17cdc59baad6fd8d175ec9a644575cdc8c5d5;p=spider.git diff --git a/perl/Spot.pm b/perl/Spot.pm index 53f98fa6..3bd74c4f 100644 --- a/perl/Spot.pm +++ b/perl/Spot.pm @@ -368,13 +368,15 @@ sub dup chomp $text; $text =~ s/\%([0-9A-F][0-9A-F])/chr(hex($1))/eg; - $text = unpad($text); - $text = substr($text, 0, $duplth) if length $text > $duplth; + $text = uc unpad($text); + my ($prefix) = $text =~ /\b(\w{1,4})$/; + $text =~ s/\b\w{1,4}$// if $prefix && is_prefix($prefix); + $text = substr($text, 0, $duplth) if length $text > $duplth; $text = pack("C*", map {$_ & 127} unpack("C*", $text)); - $text =~ s/[^a-zA-Z0-9]//g; - my $ldupkey = "X$freq|$call|$by|" . uc $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; + return 1 if $t && $t - $main::systime > 0; DXDupe::add($ldupkey, $main::systime+$dupage); # my $sdupkey = "X$freq|$call|$by"; # $t = DXDupe::find($sdupkey);