$use_db_for_search = 0;
our %spotcache; # the cache of data within the last $spotcachedays 0 or 2+ days
-our $spotcachedays = 0;
-
+our $spotcachedays = 2; # default 2 days worth
+our $minselfspotqrg = 1240000; # minimum freq above which self spotting is allowed
our $readback = 1;
}
# 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 $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, \@_;
-
- # remove old days
- while (keys %spotcache > $spotcachedays+1) {
- while (sort keys %spotcache > $spotcachedays+1) {
- delete $spotcache{$_};
- }
- }
}
if ($main::dbh) {
$main::dbh->begin_work;
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}) {
# format a spot for user output in list mode
sub formatl
{
- my $t = ztime($_[2]);
- my $d = cldate($_[2]);
- return sprintf "%8.1f %-11s %s %s %-28.28s%7s>", $_[0], $_[1], $d, $t, ($_[3]||''), "<$_[4]" ;
+ my $t = ztime($_[3]);
+ my $d = cldate($_[3]);
+ my $width = ($_[0] ? $_[0] : 80) - 80 + 28;
+ my $comment = $_[4] || '';
+ $comment = substr $comment, 0, $width if length $comment > $width;
+ $comment .= ' ' x ($width - length($comment)) if $comment < $width;
+
+# return sprintf "%8.1f %-11s %s %s %-28.28s%7s>", $_[0], $_[1], $d, $t, ($_[3]||''), "<$_[4]" ;
+ return sprintf "%8.1f %-11s %s %s ${comment}%7s>", $_[1], $_[2], $d, $t, "<$_[5]" ;
}
# enter the spot for dup checking and return true if it is already a dup
{
my $date = Julian::Day->new($main::systime)->sub(1);
genstats($date) unless checkstats($date);
+ clean_cache();
}
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;