X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FAnnTalk.pm;h=ee7ea51570164916e925f08f34eb24c79dae46ee;hb=refs%2Fheads%2Fnewdisc;hp=982e9c49afc9eb99b679ac180ecbdab8a48af0a4;hpb=47597a3f8635c4d4de89419c0c808ddcda59b9d5;p=spider.git

diff --git a/perl/AnnTalk.pm b/perl/AnnTalk.pm
index 982e9c49..ee7ea515 100644
--- a/perl/AnnTalk.pm
+++ b/perl/AnnTalk.pm
@@ -3,7 +3,7 @@
 #
 # Copyright (c) 2000 Dirk Koopman
 #
-# $Id$
+#
 #
 
 package AnnTalk;
@@ -17,8 +17,8 @@ use DXVars;
 
 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
+$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],
@@ -27,34 +27,31 @@ $filterdef = bless ([
 			  ['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],
+			  ['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;
-$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/\%([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; 
-	$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);
+	my $dupkey = "A$call|$to|\L$text";
+	return DXDupe::check($dupkey, $t);
 }
 
 sub listdups
@@ -62,6 +59,22 @@ 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;