X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXDupe.pm;h=a5db5499c418e414913dbb60550573e970713030;hb=7574ad49911d0cbe7711257025a13b9b273b7b93;hp=fb1210a2a15b7186c11980712b52ba6120d80a1d;hpb=070310c653f25c63a719396a32c216b5ce8b9dee;p=spider.git

diff --git a/perl/DXDupe.pm b/perl/DXDupe.pm
index fb1210a2..a5db5499 100644
--- a/perl/DXDupe.pm
+++ b/perl/DXDupe.pm
@@ -20,14 +20,12 @@ $lasttime = 0;
 $fn = "$main::data/dupefile";
 
 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;
+
+main::mkver($VERSION = q$Revision$);
 
 sub init
 {
-	$dbm = tie (%d, 'DB_File', $fn) or confess "can't open dupe file: $fn ($!)";
+	$dbm = tie (%d, 'DB_File', $fn);
 	unless ($dbm) {
 		eval { untie %d };
 		dbg("Dupefile $fn corrupted, removing...");
@@ -46,21 +44,21 @@ sub finish
 
 sub check
 {
-	my ($s, $t) = @_;
+	my $s = shift;
 	return 1 if find($s);
-	add($s, $t);
+	add($s, shift);
 	return 0;
 }
 
 sub find
 {
-	return 1 if exists $d{$_[0]};
+	return $d{$_[0]};
 }
 
 sub add
 {
-	my ($s, $t) = @_;
-	$t = $main::systime + $default unless $t;
+	my $s = shift;
+	my $t = shift || $main::systime + $default;
 	$d{$s} = $t;
 }
 
@@ -103,7 +101,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;
 }