trim duplth after normalisation

[spider.git] / perl / AnnTalk.pm

diff --git a/perl/AnnTalk.pm b/perl/AnnTalk.pm
index 30f8964c4aee36ae463effa203b2c9a9dd935cd0..75feb9d92b3c7f71311ffe3917070f6261d6ca36 100644 (file)
--- a/perl/AnnTalk.pm
+++ b/perl/AnnTalk.pm
@@ -40,23 +40,24 @@ $filterdef = bless ([
 
 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));
+$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 = pack("C*", map {$_ & 127} unpack("C*", $text));
-       $text =~ s/[^a-zA-Z0-9]//g;
+       $text =~ s/[^\#a-zA-Z0-9]//g;
+       $text = substr($text, 0, $duplth) if length $text > $duplth; 
        my $dupkey = "A$to|\L$text";
-       return DXDupe::check($dupkey, $main::systime + $dupage);
+       return DXDupe::check($dupkey, $t);
 }
 
 sub listdups