merged back NEW_ROUTE into trunk

[spider.git] / perl / AnnTalk.pm

diff --git a/perl/AnnTalk.pm b/perl/AnnTalk.pm
index a74c0e250495bfdd7c1ae0603a285ddbeb8f45ed..f9fd7828513382c8d2807cc48c44b0103845d264 100644 (file)
--- a/perl/AnnTalk.pm
+++ b/perl/AnnTalk.pm
@@ -25,15 +25,15 @@ $filterdef = bless ([
                          ['dest', 'c', 1],
                          ['info', 't', 2],
                          ['group', 't', 3],
+                         ['origin', 'c', 4],
                          ['wx', 't', 5],
-                         ['origin', 'c', 7, 4],
-                         ['origin_dxcc', 'c', 10],
-                         ['origin_itu', 'c', 11],
-                         ['origin_itu', 'c', 12],
+                         ['channel', 'n', 6],
                          ['by_dxcc', 'n', 7],
                          ['by_itu', 'n', 8],
                          ['by_zone', 'n', 9],
-                         ['channel', 'n', 6],
+                         ['origin_dxcc', 'n', 10],
+                         ['origin_itu', 'n', 11],
+                         ['origin_itu', 'n', 12],
                         ], 'Filter::Cmd');
 
 
@@ -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";