X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FAnnTalk.pm;h=77f80fe29bc8c2308495d7405455f294efbdd55b;hb=2b58ccdf81685a1167a43c38705a0d84b9d8d661;hp=658c21b82ee52380b0c1b49735bf018774cd9074;hpb=19b30b579e7e8f79becc58aba2e3d0a2516a375c;p=spider.git

diff --git a/perl/AnnTalk.pm b/perl/AnnTalk.pm
index 658c21b8..77f80fe2 100644
--- a/perl/AnnTalk.pm
+++ b/perl/AnnTalk.pm
@@ -13,11 +13,34 @@ use strict;
 use DXUtil;
 use DXDebug;
 use DXDupe;
+use DXVars;
 
-use vars qw(%dup $duplth $dupage);
+use vars qw(%dup $duplth $dupage $filterdef);
 
 $duplth = 60;					# the length of text to use in the deduping
 $dupage = 5*24*3600;			# the length of time to hold spot dups
+$filterdef = bless ([
+			  # tag, sort, field, priv, special parser 
+			  ['by', 'c', 0],
+			  ['dest', 'c', 1],
+			  ['info', 't', 2],
+			  ['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],
+			 ], '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
@@ -26,9 +49,10 @@ 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|$text";
+	my $dupkey = "A$to|\L$text";
 	return DXDupe::check($dupkey, $main::systime + $dupage);
 }