X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FAnnTalk.pm;h=b48dc7e0ca56f58a1bc8ed5693541cf89d6bbc93;hb=66ff43a4977e5877448981a7e3674a5c52b214ed;hp=f9fd7828513382c8d2807cc48c44b0103845d264;hpb=6624dcdf07d628e8d6a16fc6549edf40be25b7b2;p=spider.git

diff --git a/perl/AnnTalk.pm b/perl/AnnTalk.pm
index f9fd7828..b48dc7e0 100644
--- a/perl/AnnTalk.pm
+++ b/perl/AnnTalk.pm
@@ -27,15 +27,20 @@ $filterdef = bless ([
 			  ['group', 't', 3],
 			  ['origin', 'c', 4],
 			  ['wx', 't', 5],
-			  ['channel', 'n', 6],
-			  ['by_dxcc', 'n', 7],
-			  ['by_itu', 'n', 8],
-			  ['by_zone', 'n', 9],
-			  ['origin_dxcc', 'n', 10],
-			  ['origin_itu', 'n', 11],
-			  ['origin_itu', 'n', 12],
+			  ['channel', 'c', 6],
+			  ['by_dxcc', 'nc', 7],
+			  ['by_itu', 'ni', 8],
+			  ['by_zone', 'nz', 9],
+			  ['origin_dxcc', 'nc', 10],
+			  ['origin_itu', 'ni', 11],
+			  ['origin_zone', 'nz', 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,9 +49,10 @@ sub dup
 
 	chomp $text;
 	unpad($text);
-	$text =~ s/[\\\%]\d+//g;
-	$text =~ s/[^a-zA-Z0-9]//g;
+	$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;
 	my $dupkey = "A$to|\L$text";
 	return DXDupe::check($dupkey, $main::systime + $dupage);
 }