X-Git-Url: http://www.dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXDupe.pm;h=3625183fe4d7260cd03cb35ded2b84b0f9d89e73;hb=refs%2Fheads%2Fstaging;hp=2ab0ca8cee3c81c15e677dafa8d855511186bb10;hpb=44bab9382ffb0bf12639af84729d1c42ac4d9ae2;p=spider.git

diff --git a/perl/DXDupe.pm b/perl/DXDupe.pm
index 2ab0ca8c..3625183f 100644
--- a/perl/DXDupe.pm
+++ b/perl/DXDupe.pm
@@ -17,31 +17,50 @@ use vars qw{$lasttime $dbm %d $default $fn};
 
 $default = 48*24*60*60;
 $lasttime = 0;
-$fn = "$main::data/dupefile";
+localdata_mv("dupefile");
+$fn = localdata("dupefile");
 
 sub init
 {
-	$dbm = tie (%d, 'DB_File', $fn) or confess "can't open dupe file: $fn ($!)";
+	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) = @_;
-	return 1 if exists $d{$s};
-	$t = $main::systime + $default unless $t;
-	$d{$s} = $t;
+	my $s = shift;
+	return 1 if find($s);
+	add($s, shift);
 	return 0;
 }
 
+sub find
+{
+	return $d{$_[0]};
+}
+
+sub add
+{
+	my $s = shift;
+	my $t = shift || $main::systime + $default;
+	$d{$s} = $t;
+	dbg(sprintf("DXDupe::add key: $s time: %s", ztime($t))) if isdbg('dxdupe');
+}
+
 sub del
 {
 	my $s = shift;
+	dbg(sprintf("DXDupe::del key: $s time: %s", ztime($d{$s}))) if isdbg('dxdupe');
 	delete $d{$s};
 }
 
@@ -49,9 +68,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;
 	}
 }
@@ -73,12 +94,21 @@ sub listdups
 	my $regex = shift;
 
 	$regex =~ s/[\^\$\@\%]//g;
+	$regex = ".*$regex" if $regex;
 	$regex = "^$let" . $regex;
 	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;