X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FAnnTalk.pm;h=443e7442169c705344a1c2c4fe8af5529eb52dfa;hb=b9dffeff7239952814342dad19db3a51def6fab7;hp=0269edaa1e7a9ea4150fff83f9dccaf5efa65e5a;hpb=17f0b57add792391822d38116e89b33c1df4e2dd;p=spider.git

diff --git a/perl/AnnTalk.pm b/perl/AnnTalk.pm
index 0269edaa..443e7442 100644
--- a/perl/AnnTalk.pm
+++ b/perl/AnnTalk.pm
@@ -34,27 +34,24 @@ $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;
-$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;
+	$text = substr($text, 0, $duplth) if length $text > $duplth; 
 	my $dupkey = "A$to|\L$text";
-	return DXDupe::check($dupkey, $main::systime + $dupage);
+	return DXDupe::check($dupkey, $t);
 }
 
 sub listdups
@@ -69,7 +66,7 @@ sub is_talk_candidate
 {
 	my ($from, $text) = @_;
 	my $call;
-	($call) = $text =~ /^\s*(?:[Xx]|[Tt][Oo]?)\s+([\w-]+)/;
+	($call) = $text =~ /^\s*(?:[Xx]|[Tt][Oo]?:?)\s+([\w-]+)/;
 	($call) = $text =~ /^\s*>\s*([\w-]+)\b/ unless $call;
 	($call) = $text =~ /^\s*([\w-]+):?\b/ unless $call;
 	if ($call) {