projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix from_DXProt better
[spider.git]
/
perl
/
Spot.pm
diff --git
a/perl/Spot.pm
b/perl/Spot.pm
index 5f8adf49a81f0e8fb00cebce06a15057b37b8ddb..3bd74c4fdca77fa1c74baf9ac5a604c4aed415a6 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],
@@
-359,29
+361,27
@@
sub dup
$d = int ($d / 60);
$d *= 60;
$d = int ($d / 60);
$d *= 60;
+ $by =~ s/-\d+$//g;
+
$freq = sprintf "%.1f", $freq; # normalise frequency
$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 = substr($text, 0, $duplth) if length $text > $duplth;
- unpad($text);
+ $text = uc unpad($text);
+ my ($prefix) = $text =~ /\b(\w{1,4})$/;
+ $text =~ s/\b\w{1,4}$// if $prefix && is_prefix($prefix);
+ $text = substr($text, 0, $duplth) if length $text > $duplth;
$text = pack("C*", map {$_ & 127} unpack("C*", $text));
$text = pack("C*", map {$_ & 127} unpack("C*", $text));
- $text =~ s/[^a-zA-Z0-9]//g;
- my $ldupkey = "X$freq|$call|\L$text";
- my $sdupkey = "X$freq|$call|$by";
+ $text =~ s/[^\w]//g;
+ my $ldupkey = "X$freq|$call|$by|$text";
my $t = DXDupe::find($ldupkey);
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;
DXDupe::add($ldupkey, $main::systime+$dupage);
DXDupe::add($ldupkey, $main::systime+$dupage);
- DXDupe::add($sdupkey, $main::systime+$dupage);
+# my $sdupkey = "X$freq|$call|$by";
+# $t = DXDupe::find($sdupkey);
+# return 1 if $t && $t - $main::systime > 0;
+# DXDupe::add($sdupkey, $main::systime+$dupage);
return 0;
}
return 0;
}