projects
/
spider.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
dbdb898
)
fix spot dupes a bit more so that there is an hour's gap between dupes
author
minima
<minima>
Fri, 25 Feb 2005 17:19:09 +0000
(17:19 +0000)
committer
minima
<minima>
Fri, 25 Feb 2005 17:19:09 +0000
(17:19 +0000)
perl/DXDupe.pm
patch
|
blob
|
history
perl/Spot.pm
patch
|
blob
|
history
diff --git
a/perl/DXDupe.pm
b/perl/DXDupe.pm
index d514affde180cc996461eed5c6b7fd79610afdf5..1a0eb14c9de608afca15c330b73155c9704a7411 100644
(file)
--- a/
perl/DXDupe.pm
+++ b/
perl/DXDupe.pm
@@
-44,9
+44,9
@@
sub finish
sub check
{
sub check
{
- my
($s, $t) = @_
;
+ my
$s = shift
;
return 1 if find($s);
return 1 if find($s);
- add($s,
$
t);
+ add($s,
shif
t);
return 0;
}
return 0;
}
@@
-57,8
+57,8
@@
sub find
sub add
{
sub add
{
- my
($s, $t) = @_
;
-
$t = $main::systime + $default unless $
t;
+ my
$s = shift
;
+
my $t = shift || $main::systime + $defaul
t;
$d{$s} = $t;
}
$d{$s} = $t;
}
diff --git
a/perl/Spot.pm
b/perl/Spot.pm
index 5f8adf49a81f0e8fb00cebce06a15057b37b8ddb..3844e05508e4e77661b8ea3b70e6d9057e8c3929 100644
(file)
--- a/
perl/Spot.pm
+++ b/
perl/Spot.pm
@@
-25,16
+25,18
@@
use vars qw($VERSION $BRANCH);
main::mkver($VERSION = q$Revision$);
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;
$fp = undef;
$statp = undef;
-$maxspots = 100;
# maximum spots to return
+$maxspots = 100; # maximum spots to return
$defaultspots = 10; # normal number of 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
$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],
$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
$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;
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;
$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;
$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);
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);
$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;
DXDupe::add($ldupkey, $main::systime+$dupage);
DXDupe::add($sdupkey, $main::systime+$dupage);
return 0;