trim comment lth for dupes after normalisation and not before

diff --git a/Changes b/Changes
index 5283e131f1f1d7f44de0635d1eb418071f8e28a4..73e31c126d66317d00219ab05ec55bacd973729b 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,3 +1,6 @@
+10Aug05=======================================================================
+1. trim dx spot duplicate length after normalisation
+2. Do the same for announces
 08Jul05=======================================================================
 1. new CTY.DAT encorporated
 27May05=======================================================================

diff --git a/perl/AnnTalk.pm b/perl/AnnTalk.pm
index 0b564064ee15989bbc2c1af12571ccd790357082..63f2512b697356dd60c5f989a87556c7889446e2 100644 (file)
--- a/perl/AnnTalk.pm
+++ b/perl/AnnTalk.pm
@@ -53,9 +53,9 @@ sub dup
        chomp $text;
        unpad($text);
        $text =~ s/\%([0-9A-F][0-9A-F])/chr(hex($1))/eg;
-       $text = substr($text, 0, $duplth) if length $text > $duplth; 
        $text = pack("C*", map {$_ & 127} unpack("C*", $text));
        $text =~ s/[^\#a-zA-Z0-9]//g;
+       $text = substr($text, 0, $duplth) if length $text > $duplth; 
        my $dupkey = "A$to|\L$text";
        return DXDupe::check($dupkey, $t);
 }

diff --git a/perl/Spot.pm b/perl/Spot.pm
index 112fcffed0565c8a9cd4010f4ab05ac52deb5972..d52575afbcc8ce25a1870aff607e8da1356c1443 100644 (file)
--- a/perl/Spot.pm
+++ b/perl/Spot.pm
@@ -343,9 +343,9 @@ sub dup
                        $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;
+       $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;