From: minima Date: Fri, 25 Feb 2005 17:19:09 +0000 (+0000) Subject: fix spot dupes a bit more so that there is an hour's gap between dupes X-Git-Tag: R_1_52~127 X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=dd9bf905904d67616b549091784863d3e34a97ed;p=spider.git fix spot dupes a bit more so that there is an hour's gap between dupes --- diff --git a/perl/DXDupe.pm b/perl/DXDupe.pm index d514affd..1a0eb14c 100644 --- a/perl/DXDupe.pm +++ b/perl/DXDupe.pm @@ -44,9 +44,9 @@ sub finish sub check { - my ($s, $t) = @_; + my $s = shift; return 1 if find($s); - add($s, $t); + add($s, shift); return 0; } @@ -57,8 +57,8 @@ sub find sub add { - my ($s, $t) = @_; - $t = $main::systime + $default unless $t; + my $s = shift; + my $t = shift || $main::systime + $default; $d{$s} = $t; } diff --git a/perl/Spot.pm b/perl/Spot.pm index 5f8adf49..3844e055 100644 --- a/perl/Spot.pm +++ b/perl/Spot.pm @@ -25,16 +25,18 @@ use vars qw($VERSION $BRANCH); main::mkver($VERSION = q$Revision$); -use vars qw($fp $statp $maxspots $defaultspots $maxdays $dirprefix $duplth $dupage $filterdef $totalspots $hfspots $vhfspots ); +use vars qw($fp $statp $maxspots $defaultspots $maxdays $dirprefix $duplth $dupage $filterdef $totalspots $hfspots $vhfspots $maxcalllth ); $fp = undef; $statp = undef; -$maxspots = 100; # maximum spots to return +$maxspots = 100; # maximum spots to return $defaultspots = 10; # normal number of spots to return -$maxdays = 100; # normal maximum no of days to go back +$maxdays = 100; # normal maximum no of days to go back $dirprefix = "spots"; $duplth = 20; # the length of text to use in the deduping -$dupage = 3*3600; # the length of time to hold spot dups +$dupage = 3600; # the length of time to hold spot dups +$maxcalllth = 12; # the maximum call lth + $filterdef = bless ([ # tag, sort, field, priv, special parser ['freq', 'r', 0, 0, \&decodefreq], @@ -360,26 +362,20 @@ sub dup $d *= 60; $freq = sprintf "%.1f", $freq; # normalise frequency - $call = substr($call, 0, 12) if length $call > 12; + $call = substr($call, 0, $maxcalllth) if length $call > $maxcalllth; chomp $text; $text =~ s/\%([0-9A-F][0-9A-F])/chr(hex($1))/eg; + $text = unpad($text); $text = substr($text, 0, $duplth) if length $text > $duplth; - unpad($text); $text = pack("C*", map {$_ & 127} unpack("C*", $text)); $text =~ s/[^a-zA-Z0-9]//g; - my $ldupkey = "X$freq|$call|\L$text"; + my $ldupkey = "X$freq|$call|" . uc $text; my $sdupkey = "X$freq|$call|$by"; my $t = DXDupe::find($ldupkey); - if ($t) { - my $dt = $main::systime + $dupage - $t; - return 1 if $dt < 300; - } + return 1 if $t && $t - $main::systime > 0; $t = DXDupe::find($sdupkey); - if ($t) { - my $dt = $main::systime + $dupage - $t; - return 1 if $dt < 300; - } + return 1 if $t && $t - $main::systime > 0; DXDupe::add($ldupkey, $main::systime+$dupage); DXDupe::add($sdupkey, $main::systime+$dupage); return 0;