get the prefix detection in the comments correct (or at least better)

[spider.git] / perl / Spot.pm

diff --git a/perl/Spot.pm b/perl/Spot.pm
index 82563bba003126666ce16e9ab0e3beb9c39511b7..995bad539e4bb9450134a515a4aa642a21c014d9 100644 (file)
--- a/perl/Spot.pm
+++ b/perl/Spot.pm
@@ -333,18 +333,19 @@ sub dup
 
        chomp $text;
        $text =~ s/\%([0-9A-F][0-9A-F])/chr(hex($1))/eg;
-       $text = unpad($text);
+       $text = uc unpad($text);
+       my ($prefix) = $text =~ /\b(\w{1,4})$/;
+       $text =~ s/\b\w{1,4}$// if $prefix && Prefix::extract($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;
+       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($ldupkey, $main::systime+$dupage);
-       DXDupe::add($sdupkey, $main::systime+$dupage);
+#      DXDupe::add($sdupkey, $main::systime+$dupage);
        return 0;
 }