add expires onto dupe listings

use correct default age for spots

diff --git a/perl/DXDupe.pm b/perl/DXDupe.pm
index b7d2618a9196fd67e94919795edd61ec0cebdc2a..6595ef879c7cdd4446106e2a5183758d62fd2af7 100644 (file)
--- a/perl/DXDupe.pm
+++ b/perl/DXDupe.pm
@@ -103,7 +103,7 @@ sub listdups
        my @out;
        for (sort { $d{$a} <=> $d{$b} } grep { m{$regex}i } keys %d) {
                my ($dum, $key) = unpack "a1a*", $_;
-               push @out, "$key = " . cldatetime($d{$_} - $dupage);
+               push @out, "$key = " . cldatetime($d{$_} - $dupage) . " expires " . cldatetime($d{$_});
        }
        return @out;
 }

diff --git a/perl/Spot.pm b/perl/Spot.pm
index 228804855ce97ed593076d479499aa1778a4e309..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