projects
/
spider.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
743a03b
)
fix spot cache clean, some detail rbn changes
author
Dirk Koopman
<djk@tobit.co.uk>
Wed, 17 Nov 2021 11:41:16 +0000
(11:41 +0000)
committer
Dirk Koopman
<djk@tobit.co.uk>
Wed, 17 Nov 2021 11:41:16 +0000
(11:41 +0000)
perl/RBN.pm
patch
|
blob
|
history
perl/Spot.pm
patch
|
blob
|
history
diff --git
a/perl/RBN.pm
b/perl/RBN.pm
index 8c2fbaadc5911079367118faac7a1c71ac4987e6..0cf5c4149c4940c979280ca28eea537a89be7477 100644
(file)
--- a/
perl/RBN.pm
+++ b/
perl/RBN.pm
@@
-251,8
+251,20
@@
sub normal
return;
}
return;
}
- $origin =~ s/\-(?:\d{1,2}\-)?\#$//; # get rid of all the crap we aren't interested in
+ # remove all extraneous crap from the origin - just leave the base callsign
+ $origin =~ s|^(?:[\w\d]+/)?([\w\d]+).*$|$1|;
+ # is this callsign in badspotter list?
+ if ($DXProt::badspotter->in($origin) || $DXProt::badnode->in($origin)) {
+ dbg("RBN: ERROR $origin is a bad spotter/node, dumped");
+ return;
+ }
+
+ # is the qrg valid
+ unless ($qrg =~ /^\d+\.\d{1,2}$/) {
+ dbg("RBN: ERROR qrg $qrg from $origin invalid, dumped");
+ return;
+ }
$sort ||= '';
$tx ||= '';
$sort ||= '';
$tx ||= '';
diff --git
a/perl/Spot.pm
b/perl/Spot.pm
index 27b82b381d45fa851af0f32123256b5344157f1a..d88a5f7f4d425a0ac2b22769beada412df347578 100644
(file)
--- a/
perl/Spot.pm
+++ b/
perl/Spot.pm
@@
-186,7
+186,7
@@
sub init
}
# initialise the cache if required
}
# initialise the cache if required
- if ($spotcachedays) {
+ if ($spotcachedays
> 0
) {
my $t0 = [gettimeofday];
$spotcachedays = 2 if $spotcachedays < 2;
dbg "Spot::init - reading in $spotcachedays days of spots into cache";
my $t0 = [gettimeofday];
$spotcachedays = 2 if $spotcachedays < 2;
dbg "Spot::init - reading in $spotcachedays days of spots into cache";
@@
-260,18
+260,11
@@
sub add
{
my $buf = join('^', @_);
$fp->writeunix($_[2], $buf);
{
my $buf = join('^', @_);
$fp->writeunix($_[2], $buf);
- if ($spotcachedays) {
+ if ($spotcachedays
> 0
) {
my $now = Julian::Day->new($_[2]);
my $day = _cachek($now);
my $r = (exists $spotcache{$day}) ? $spotcache{$day} : ($spotcache{$day} = []);
unshift @$r, \@_;
my $now = Julian::Day->new($_[2]);
my $day = _cachek($now);
my $r = (exists $spotcache{$day}) ? $spotcache{$day} : ($spotcache{$day} = []);
unshift @$r, \@_;
-
- # remove old days
- while (keys %spotcache > $spotcachedays+1) {
- while (sort keys %spotcache > $spotcachedays+1) {
- delete $spotcache{$_};
- }
- }
}
if ($main::dbh) {
$main::dbh->begin_work;
}
if ($main::dbh) {
$main::dbh->begin_work;
@@
-376,7
+369,7
@@
sub search
my $cachekey = _cachek($this);
my $rec = 0;
my $cachekey = _cachek($this);
my $rec = 0;
- if ($spotcachedays && $spotcache{$cachekey}) {
+ if ($spotcachedays
> 0
&& $spotcache{$cachekey}) {
foreach my $r (@{$spotcache{$cachekey}}) {
++$rec;
if ($dofilter && $dxchan && $dxchan->{spotsfilter}) {
foreach my $r (@{$spotcache{$cachekey}}) {
++$rec;
if ($dofilter && $dxchan && $dxchan->{spotsfilter}) {
@@
-584,12
+577,27
@@
sub daily
{
my $date = Julian::Day->new($main::systime)->sub(1);
genstats($date) unless checkstats($date);
{
my $date = Julian::Day->new($main::systime)->sub(1);
genstats($date) unless checkstats($date);
+ clean_cache();
}
sub _cachek
{
return "$_[0]->[0]|$_[0]->[1]";
}
}
sub _cachek
{
return "$_[0]->[0]|$_[0]->[1]";
}
+
+sub clean_cache
+{
+ if ($spotcachedays > 0) {
+ my $now = Julian::Day->new($main::systime);
+ for (my $i = $spotcachedays; $i < $spotcachedays + 5; ++$i ) {
+ my $k = _cachek($now->sub($i));
+ if (exists $spotcache{$k}) {
+ dbg("Spot::spotcache deleting day $k, more than $spotcachedays days old");
+ delete $spotcache{$k};
+ }
+ }
+ }
+}
1;
1;