add expires onto dupe listings

[spider.git] / perl / Spot.pm

diff --git a/perl/Spot.pm b/perl/Spot.pm
index 995bad539e4bb9450134a515a4aa642a21c014d9..d351b82ce600db83e222fc046ffb32471c34ab6f 100644 (file)
--- a/perl/Spot.pm
+++ b/perl/Spot.pm
@@ -36,7 +36,7 @@ $defaultspots = 10;                           # normal number of spots to return
 $maxdays = 100;                                # normal maximum no of days to go back
 $dirprefix = "spots";
 $duplth = 20;                                  # the length of text to use in the deduping
-$dupage = 3*3600;               # the length of time to hold spot dups
+$dupage = 1*3600;               # the length of time to hold spot dups
 $maxcalllth = 12;                               # the max length of call to take into account for dupes
 $filterdef = bless ([
                          # tag, sort, field, priv, special parser 
@@ -335,9 +335,10 @@ sub dup
        $text =~ s/\%([0-9A-F][0-9A-F])/chr(hex($1))/eg;
        $text = uc unpad($text);
        my ($prefix) = $text =~ /\b(\w{1,4})$/;
-       $text =~ s/\b\w{1,4}$// if $prefix && Prefix::extract($prefix);
+       $text =~ s/\b\w{1,4}$// if $prefix && is_prefix($prefix);
        $text = substr($text, 0, $duplth) if length $text > $duplth; 
        $text = pack("C*", map {$_ & 127} unpack("C*", $text));
+       $text =~ s/[^\w]//g;
        my $ldupkey = "X$freq|$call|$by|$text";
        my $t = DXDupe::find($ldupkey);
        return 1 if $t && $t - $main::systime > 0;