X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FAnnTalk.pm;h=77f80fe29bc8c2308495d7405455f294efbdd55b;hb=a46e7e063c95e0dc3a470f91568cedb58290769c;hp=a74c0e250495bfdd7c1ae0603a285ddbeb8f45ed;hpb=956e3acab807900fdbccc0e2fa5e999327a1c1ce;p=spider.git

diff --git a/perl/AnnTalk.pm b/perl/AnnTalk.pm
index a74c0e25..77f80fe2 100644
--- a/perl/AnnTalk.pm
+++ b/perl/AnnTalk.pm
@@ -25,17 +25,22 @@ $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');
 
+use vars qw($VERSION $BRANCH);
+$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
+$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ ) || 0;
+$main::build += $VERSION;
+$main::branch += $BRANCH;
 
 # enter the spot for dup checking and return true if it is already a dup
 sub dup
@@ -44,6 +49,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";