X-Git-Url: http://www.dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FAnnTalk.pm;h=6d47726420f9cab730555853303429bd93367c44;hb=2110beabbe4a0c22fbab1ce4f68bec6b94db0ae4;hp=0b564064ee15989bbc2c1af12571ccd790357082;hpb=defc60f3e7fab9bb99d1c9f7b8bccc4ec37628d5;p=spider.git diff --git a/perl/AnnTalk.pm b/perl/AnnTalk.pm index 0b564064..6d477264 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], @@ -38,12 +38,6 @@ $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 { @@ -53,10 +47,10 @@ sub dup 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 = pack("C*", map {$_ & 127} unpack("C*", $text)); +# $text = Encode::encode("iso-8859-1", $text) if $main::can_encode && Encode::is_utf8($text, 1); $text =~ s/[^\#a-zA-Z0-9]//g; - my $dupkey = "A$to|\L$text"; + $text = substr($text, 0, $duplth) if length $text > $duplth; + my $dupkey = "A$call|$to|\L$text"; return DXDupe::check($dupkey, $t); }