X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXDupe.pm;h=613a2aec677794ba1cd6fe145ea90c3901b61dac;hb=0be137c3bbf8516ccfa5fd2a88952595ee279a54;hp=b7d2618a9196fd67e94919795edd61ec0cebdc2a;hpb=c59e6497c9717e7585fb87c7c9ce9aee0d62a373;p=spider.git

diff --git a/perl/DXDupe.pm b/perl/DXDupe.pm
index b7d2618a..613a2aec 100644
--- a/perl/DXDupe.pm
+++ b/perl/DXDupe.pm
@@ -9,32 +9,25 @@
 
 package DXDupe;
 
+use strict;
+
 use DXDebug;
 use DXUtil;
 use DXVars;
+use DB_File;
 
 use vars qw{$lasttime $dbm %d $default $fn};
 
 $default = 48*24*60*60;
 $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;
+localdata_mv("dupefile");
+$fn = localdata("dupefile");
 
 sub init
 {
+	unlink $fn;
 	$dbm = tie (%d, 'DB_File', $fn);
-	unless ($dbm) {
-		eval { untie %d };
-		dbg("Dupefile $fn corrupted, removing...");
-		unlink $fn;
-		$dbm = tie (%d, 'DB_File', $fn) or confess "can't open dupe file: $fn ($!)";
-		confess "cannot open $fn $!" unless $dbm; 
-	}
+	confess "cannot open $fn $!" unless $dbm;
 }
 
 sub finish
@@ -42,6 +35,7 @@ sub finish
 	undef $dbm;
 	untie %d;
 	undef %d;
+	unlink $fn;
 }
 
 sub check
@@ -74,9 +68,11 @@ sub process
 {
 	# once an hour
 	if ($main::systime - $lasttime >=  3600) {
-		while (($k, $v) = each %d) {
-			delete $d{$k} if $main::systime >= $v;
+		my @del;
+		while (my ($k, $v) = each %d) {
+			push @del, $k  if $main::systime >= $v;
 		}
+		delete $d{$_} for @del;
 		$lasttime = $main::systime;
 	}
 }
@@ -85,7 +81,7 @@ sub get
 {
 	my $start = shift;
 	my @out;
-	while (($k, $v) = each %d) {
+	while (my ($k, $v) = each %d) {
 		push @out, $k, $v if !$start || $k =~ /^$start/; 
 	}
 	return @out;
@@ -103,7 +99,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;
 }