From 50c5cbb346de7d1b5026e8a205b5cf1e04e6cf05 Mon Sep 17 00:00:00 2001 From: minima Date: Wed, 10 Aug 2005 20:03:40 +0000 Subject: [PATCH] trim comment lth for dupes after normalisation and not before --- Changes | 3 +++ perl/AnnTalk.pm | 2 +- perl/Spot.pm | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Changes b/Changes index 5283e131..73e31c12 100644 --- 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 0b564064..63f2512b 100644 --- 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 112fcffe..d52575af 100644 --- 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; -- 2.34.1