projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add better new user logging in PC92/PC19
[spider.git]
/
perl
/
DXDupe.pm
diff --git
a/perl/DXDupe.pm
b/perl/DXDupe.pm
index a5bb8a1b9cd762f9d4bdd0e1e2208f07743ba244..795346db5ad89ea1d104e20a61ebffead5aee7f1 100644
(file)
--- a/
perl/DXDupe.pm
+++ b/
perl/DXDupe.pm
@@
-17,28
+17,23
@@
use vars qw{$lasttime $dbm %d $default $fn};
$default = 48*24*60*60;
$lasttime = 0;
$default = 48*24*60*60;
$lasttime = 0;
-$fn = "$main::data/dupefile";
-
-use vars qw($VERSION $BRANCH);
-($VERSION, $BRANCH) = dxver(q$Revision$);
+localdata_mv("dupefile");
+$fn = localdata("dupefile");
sub init
{
sub init
{
+ unlink $fn;
$dbm = tie (%d, 'DB_File', $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
{
}
sub finish
{
+ dbg("DXDupe finishing");
undef $dbm;
untie %d;
undef %d;
undef $dbm;
untie %d;
undef %d;
+ unlink $fn;
}
sub check
}
sub check
@@
-51,19
+46,27
@@
sub check
sub find
{
sub find
{
- return $d{$_[0]};
+ return 0 unless $_[0];
+ return exists $d{$_[0]} ? $d{$_[0]} : 0;
}
sub add
{
my $s = shift;
my $t = shift || $main::systime + $default;
}
sub add
{
my $s = shift;
my $t = shift || $main::systime + $default;
+ return unless $s;
+
$d{$s} = $t;
$d{$s} = $t;
+ dbg("DXDupe::add key: $s time: " . ztime($t)) if isdbg('dxdupe');
}
sub del
{
my $s = shift;
}
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};
}
delete $d{$s};
}
@@
-75,7
+78,7
@@
sub process
while (($k, $v) = each %d) {
push @del, $k if $main::systime >= $v;
}
while (($k, $v) = each %d) {
push @del, $k if $main::systime >= $v;
}
- del
ete $d{$_}
for @del;
+ del
($k)
for @del;
$lasttime = $main::systime;
}
}
$lasttime = $main::systime;
}
}
@@
-106,4
+109,12
@@
sub listdups
}
return @out;
}
}
return @out;
}
+
+sub END
+{
+ if ($dbm) {
+ dbg("DXDupe ENDing");
+ finish();
+ }
+}
1;
1;