From: minima <minima>
Date: Thu, 30 Nov 2000 12:02:36 +0000 (+0000)
Subject:  remove %nn strings from dups of announces and spots
X-Git-Tag: R_1_45~13
X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=commitdiff_plain;h=b228776e730a2aaf6c18d2f88a458719e6b0275a;p=spider.git

 remove %nn strings from dups of announces and spots
---

diff --git a/Changes b/Changes
index 8fb65fe8..84cb05be 100644
--- a/Changes
+++ b/Changes
@@ -1,3 +1,5 @@
+30Nov00=======================================================================
+1. remove %nn strings from dups of announces and spots
 29Nov00=======================================================================
 1. make some small changes to DXmsg to try to track delete problems?
 2. fix ann/full so it doesn't dup
diff --git a/perl/AnnTalk.pm b/perl/AnnTalk.pm
index a74c0e25..5a387d21 100644
--- a/perl/AnnTalk.pm
+++ b/perl/AnnTalk.pm
@@ -44,6 +44,7 @@ sub dup
 
 	chomp $text;
 	unpad($text);
+	$text =~ s/[\\\%]\d+//g;
 	$text =~ s/[^a-zA-Z0-9]//g;
 	$text = substr($text, 0, $duplth) if length $text > $duplth; 
 	my $dupkey = "A$to|\L$text";
diff --git a/perl/Spot.pm b/perl/Spot.pm
index 67d8a658..7e621c91 100644
--- a/perl/Spot.pm
+++ b/perl/Spot.pm
@@ -300,6 +300,7 @@ sub dup
 	chomp $text;
 	$text = substr($text, 0, $duplth) if length $text > $duplth; 
 	unpad($text);
+	$text =~ s/[\\\%]\d+//g;
 	$text =~ s/[^a-zA-Z0-9]//g;
 	my $dupkey = "X$freq|$call|$d|\L$text";
 	return DXDupe::check($dupkey, $main::systime+$dupage);