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

diff --git a/perl/AnnTalk.pm b/perl/AnnTalk.pm
index 34185745..0b564064 100644
--- a/perl/AnnTalk.pm
+++ b/perl/AnnTalk.pm
@@ -15,23 +15,49 @@ 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', '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],
+			  ['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,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/[^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);
+	return DXDupe::check($dupkey, $t);
 }
 
 sub listdups
@@ -39,6 +65,21 @@ sub listdups
 	return DXDupe::listdups('A', $dupage, @_);
 }
 
-
+# is this text field a likely announce to talk substitution?
+# this may involve all sorts of language dependant heuristics, but 
+# then again, it might not
+sub is_talk_candidate
+{
+	my ($from, $text) = @_;
+	my $call;
+	($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) {
+		$call = uc $call;
+		return is_callsign($call);
+	}
+    return undef;
+}
 1;