remove %nn strings from dups of announces and spots

diff --git a/Changes b/Changes
index 8fb65fe8f2c5edf170bcfae50044258c52985474..84cb05be5e4f85cacb53eb7ffc8557771fdfac8e 100644 (file)
--- 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 a74c0e250495bfdd7c1ae0603a285ddbeb8f45ed..5a387d219ff30946138c720d92ce36ac058c68b0 100644 (file)
--- 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 67d8a6580aae023dfc6664c3985babfad0c7f9e5..7e621c91f4a947b4f7efa75e8c742916a9440c94 100644 (file)
--- 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);