added the state filtering stuff

[spider.git] / perl / AnnTalk.pm

diff --git a/perl/AnnTalk.pm b/perl/AnnTalk.pm
index 0269edaa1e7a9ea4150fff83f9dccaf5efa65e5a..30f8964c4aee36ae463effa203b2c9a9dd935cd0 100644 (file)
--- a/perl/AnnTalk.pm
+++ b/perl/AnnTalk.pm
@@ -34,11 +34,13 @@ $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;
 
@@ -69,7 +71,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) {