X-Git-Url: http://www.dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FAnnTalk.pm;h=6d47726420f9cab730555853303429bd93367c44;hb=2110beabbe4a0c22fbab1ce4f68bec6b94db0ae4;hp=a6032363ac5e7cf5d847a288e36ed4f64bcd952f;hpb=261c75481017f32ca491df475b36e9600ca430a1;p=spider.git

diff --git a/perl/AnnTalk.pm b/perl/AnnTalk.pm
index a6032363..6d477264 100644
--- a/perl/AnnTalk.pm
+++ b/perl/AnnTalk.pm
@@ -3,7 +3,7 @@
 #
 # Copyright (c) 2000 Dirk Koopman
 #
-# $Id$
+#
 #
 
 package AnnTalk;
@@ -12,50 +12,68 @@ 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
+$duplth = 30;					# the length of text to use in the deduping
+$dupage = 18*3600;				# the length of time to hold ann 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');
 
 # 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;
+	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 = Encode::encode("iso-8859-1", $text) if $main::can_encode && Encode::is_utf8($text, 1);
+	$text =~ s/[^\#a-zA-Z0-9]//g;
 	$text = substr($text, 0, $duplth) if length $text > $duplth; 
-	my $dupkey = "$call|$to|$text";
-	return 1 if exists $dup{$dupkey};
-	$dup{$dupkey} = $d;         # in seconds (to the nearest minute)
-	return 0; 
+	my $dupkey = "A$call|$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 $regex = shift;
-	$regex = '.*' unless $regex;
-	$regex =~ s/[\$\@\%]//g;
-	my @out;
-	for (sort { $dup{$a} <=> $dup{$b} } grep { m{$regex}i } keys %dup) {
-		my $val = $dup{$_};
-		push @out, "$_ = " . 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;