X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FAnnTalk.pm;h=0b564064ee15989bbc2c1af12571ccd790357082;hb=e3beb3c736ca8e9ac9665d5c55f5d0f3cdb3f783;hp=86c3defab56447519c592d3e7dee92728e110bab;hpb=9fdfb0d7573d820fb5e2db8930a9679ed6de666f;p=spider.git

diff --git a/perl/AnnTalk.pm b/perl/AnnTalk.pm
index 86c3defa..0b564064 100644
--- a/perl/AnnTalk.pm
+++ b/perl/AnnTalk.pm
@@ -34,27 +34,30 @@ $filterdef = bless ([
 			  ['origin_dxcc', 'nc', 10],
 			  ['origin_itu', 'ni', 11],
 			  ['origin_zone', 'nz', 12],
+			  ['by_state', 'nz', 13],
+			  ['origin_state', 'nz', 14],
 			 ], '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;
+$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
 $main::build += $VERSION;
 $main::branch += $BRANCH;
 
 # enter the spot for dup checking and return true if it is already a dup
 sub dup
 {
-	my ($call, $to, $text) = @_; 
+	my ($call, $to, $text, $t) = @_; 
 
+	$t ||= $main::systime + $dupage;
 	chomp $text;
 	unpad($text);
 	$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;
+	$text =~ s/[^\#a-zA-Z0-9]//g;
 	my $dupkey = "A$to|\L$text";
-	return DXDupe::check($dupkey, $main::systime + $dupage);
+	return DXDupe::check($dupkey, $t);
 }
 
 sub listdups