X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FAnnTalk.pm;h=72abfeb283c6bf35b6dbb839f999e3bf96259289;hb=c23f49862b7a8c377daf9205b219cb327608c4da;hp=30f8964c4aee36ae463effa203b2c9a9dd935cd0;hpb=8178d787d7cc8040fa8958197582bba5c80e6f59;p=spider.git

diff --git a/perl/AnnTalk.pm b/perl/AnnTalk.pm
index 30f8964c..72abfeb2 100644
--- a/perl/AnnTalk.pm
+++ b/perl/AnnTalk.pm
@@ -3,7 +3,7 @@
 #
 # Copyright (c) 2000 Dirk Koopman
 #
-# $Id$
+#
 #
 
 package AnnTalk;
@@ -18,7 +18,7 @@ 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
+$dupage = 5*3600;			# the length of time to hold spot dups
 $filterdef = bless ([
 			  # tag, sort, field, priv, special parser 
 			  ['by', 'c', 0],
@@ -38,25 +38,21 @@ $filterdef = bless ([
 			  ['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/\%([0-9A-F][0-9A-F])/chr(hex($1))/eg;
-	$text = substr($text, 0, $duplth) if length $text > $duplth; 
+	$text = Encode::encode("iso-8859-1", $text) if $main::can_encode && Encode::is_utf8($text, 1);
 	$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);
+	$text =~ s/[^\#a-zA-Z0-9]//g;
+	$text = substr($text, 0, $duplth) if length $text > $duplth; 
+	my $dupkey = "A$call|$to|\L$text";
+	return DXDupe::check($dupkey, $t);
 }
 
 sub listdups