projects
/
spider.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
acdfe8c
)
more sopt dupe changes
author
minima
<minima>
Fri, 25 Feb 2005 13:01:57 +0000
(13:01 +0000)
committer
minima
<minima>
Fri, 25 Feb 2005 13:01:57 +0000
(13:01 +0000)
perl/DXDupe.pm
patch
|
blob
|
history
perl/Spot.pm
patch
|
blob
|
history
diff --git
a/perl/DXDupe.pm
b/perl/DXDupe.pm
index 63fdcb2bb24534a41d7a970961b2edb34937f8d7..b7d2618a9196fd67e94919795edd61ec0cebdc2a 100644
(file)
--- a/
perl/DXDupe.pm
+++ b/
perl/DXDupe.pm
@@
-46,9
+46,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;
}
@@
-59,8
+59,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 d49136b725284b57a4984195d8d41b8c330518b8..61bc1a25959424bce67ced5ee6a37660e949ccb7 100644
(file)
--- a/
perl/Spot.pm
+++ b/
perl/Spot.pm
@@
-27,7
+27,7
@@
$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ || (0,0))
$main::build += $VERSION;
$main::branch += $BRANCH;
$main::build += $VERSION;
$main::branch += $BRANCH;
-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;
@@
-37,6
+37,7
@@
$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
$dirprefix = "spots";
$duplth = 20; # the length of text to use in the deduping
$dupage = 3*3600; # the length of time to hold spot dups
+$maxcalllth = 12; # the max length of call to take into account for dupes
$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],
@@
-328,26
+329,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;
- }
- $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;
+ $t = DXDupe::find($sdupkey);
+ 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;