X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXDupe.pm;h=012039ee6a614eb8035b98fc27d3b6a87dd01a88;hb=5756741d9682667ae5b0442c4e6f609bd481b6eb;hp=fb1210a2a15b7186c11980712b52ba6120d80a1d;hpb=070310c653f25c63a719396a32c216b5ce8b9dee;p=spider.git

diff --git a/perl/DXDupe.pm b/perl/DXDupe.pm
index fb1210a2..012039ee 100644
--- a/perl/DXDupe.pm
+++ b/perl/DXDupe.pm
@@ -17,56 +17,56 @@ 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
 {
-	$dbm = tie (%d, 'DB_File', $fn) or confess "can't open dupe 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; 
-	}
+	unlink $fn;
+	$dbm = tie (%d, 'DB_File', $fn);
+	confess "cannot open $fn $!" unless $dbm;
 }
 
 sub finish
 {
+	dbg("DXDupe finishing");
 	undef $dbm;
 	untie %d;
 	undef %d;
+	unlink $fn;
 }
 
 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 0 unless $_[0];
+	return $d{$_[0]};
 }
 
 sub add
 {
-	my ($s, $t) = @_;
-	$t = $main::systime + $default unless $t;
+	my $s = shift;
+	my $t = shift || $main::systime + $default;
+	return unless $s;
+
 	$d{$s} = $t;
+	dbg("DXDupe::add key: $s time: " . ztime($t)) if isdbg('dxdupe');
 }
 
 sub del
 {
 	my $s = shift;
+	return unless $s;
+	
+	my $t = $d{$s};
+	dbg("DXDupe::del key: $s time: " . ztime($t)) if isdbg('dxdupe');
 	delete $d{$s};
 }
 
@@ -74,9 +74,11 @@ sub process
 {
 	# once an hour
 	if ($main::systime - $lasttime >=  3600) {
+		my @del;
 		while (($k, $v) = each %d) {
-			delete $d{$k} if $main::systime >= $v;
+			push @del, $k  if $main::systime >= $v;
 		}
+		del($k) for @del;
 		$lasttime = $main::systime;
 	}
 }
@@ -103,8 +105,16 @@ 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;
 }
+
+sub END
+{
+	if ($dbm) {
+		dbg("DXDupe ENDing");
+		finish();
+	}
+}
 1;