X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FAnnTalk.pm;h=0b564064ee15989bbc2c1af12571ccd790357082;hb=6c8062c1356fe49974da2df121852b41971f7b77;hp=b082c38531bd0f77707129db1ac37b2250e62a86;hpb=88665a2bed3b9ec9e97237938a95a045b2a21bb4;p=spider.git

diff --git a/perl/AnnTalk.pm b/perl/AnnTalk.pm
index b082c385..0b564064 100644
--- a/perl/AnnTalk.pm
+++ b/perl/AnnTalk.pm
@@ -12,46 +12,74 @@ use strict;
 
 use DXUtil;
 use DXDebug;
+use DXDupe;
+use DXVars;
 
-use vars qw(%dup $duplth $dupage);
+use vars qw(%dup $duplth $dupage $filterdef);
 
-%dup = ();						# the duplicates hash
 $duplth = 60;					# the length of text to use in the deduping
-$dupage = 24*3600;               # the length of time to hold spot dups
+$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 $d = $main::systime / 60;
+	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; 
-	my $dupkey = "$call|$to|$text";
-	return 1 if exists $dup{$dupkey};
-	$dup{$dupkey} = $d * 60;         # in seconds (to the nearest minute)
-	return 0; 
+	$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, $t);
 }
 
-# called every hour and cleans out the dup cache
-sub process
+sub listdups
 {
-	my $cutoff = $main::systime - $dupage;
-	while (my ($key, $val) = each %dup) {
-		delete $dup{$key} if $val < $cutoff;
-	}
+	return DXDupe::listdups('A', $dupage, @_);
 }
 
-sub listdups
+# 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 @out;
-	for (sort { $dup{$a} <=> $dup{$b} } keys %dup) {
-		my $val = $dup{$_};
-		push @out, "$_ = $val (" . cldatetime($val) . ")";
+	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 @out;
+    return undef;
 }
-
 1;