X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FAnnTalk.pm;h=77f80fe29bc8c2308495d7405455f294efbdd55b;hb=2b58ccdf81685a1167a43c38705a0d84b9d8d661;hp=5bd44fd49e3104de3bcdec7a4bf9904147b0c433;hpb=8e45a3dac2e136dc0c9d6f1e78f8c048a8d7ba21;p=spider.git

diff --git a/perl/AnnTalk.pm b/perl/AnnTalk.pm
index 5bd44fd4..77f80fe2 100644
--- a/perl/AnnTalk.pm
+++ b/perl/AnnTalk.pm
@@ -12,45 +12,53 @@ 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', 'n', 6],
+			  ['by_dxcc', 'n', 7],
+			  ['by_itu', 'n', 8],
+			  ['by_zone', 'n', 9],
+			  ['origin_dxcc', 'n', 10],
+			  ['origin_itu', 'n', 11],
+			  ['origin_itu', 'n', 12],
+			 ], '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 $d = $main::systime / 60;
 
 	chomp $text;
 	unpad($text);
+	$text =~ s/[\\\%]\d+//g;
+	$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; 
-}
-
-# called every hour and cleans out the dup cache
-sub process
-{
-	my $cutoff = $main::systime - $dupage;
-	while (my ($key, $val) = each %dup) {
-		delete $dup{$key} if $val < $cutoff;
-	}
+	my $dupkey = "A$to|\L$text";
+	return DXDupe::check($dupkey, $main::systime + $dupage);
 }
 
 sub listdups
 {
-	my @out;
-	for (sort { $dup{$a} <=> $dup{$b} } keys %dup) {
-		my $val = $dup{$_};
-		push @out, "$_ = $val (" . cldatetime($val) . ")";
-	}
-	return @out;
+	return DXDupe::listdups('A', $dupage, @_);
 }