X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FRBN.pm;h=d9fbe053f5d20960d6eb2c3397e2b1e5af059126;hb=17b1614af3840c2c74bee181290eb094f8ed4a00;hp=418c1cb357e45947baa9779f441cd5651fc72234;hpb=29e86370c5f331ae3d2c6f85e7001a7d2e758137;p=spider.git

diff --git a/perl/RBN.pm b/perl/RBN.pm
index 418c1cb3..d9fbe053 100644
--- a/perl/RBN.pm
+++ b/perl/RBN.pm
@@ -11,6 +11,8 @@ package RBN;
 
 use 5.10.1;
 
+use lib qw {.};
+
 use DXDebug;
 use DXUtil;
 use DXLog;
@@ -18,18 +20,54 @@ use DXUser;
 use DXChannel;
 use Math::Round qw(nearest);
 use Date::Parse;
-use Time::HiRes qw(clock_gettime CLOCK_REALTIME);
+use Time::HiRes qw(gettimeofday);
 use Spot;
-use JSON;
+use DXJSON;
 use IO::File;
 
+use constant {
+			  ROrigin => 0,
+			  RQrg => 1,
+			  RCall => 2,
+			  RMode => 3,
+			  RStrength => 4,
+			  RTime => 5,
+			  RUtz => 6,
+			  Respot => 7,
+			  RQra => 8,
+			  RSpotData => 9,
+			 };
+
+use constant {
+			  SQrg => 0,
+			  SCall => 1,
+			  STime => 2,
+			  SComment => 3,
+			  SOrigin => 4,
+			  SZone => 11,
+			 };
+use constant {
+			  OQual => 0,
+			  OAvediff => 1,
+			  OSpare => 2,
+			  ODiff => 3,
+			 };
+use constant {
+			  CTime => 0,
+			  CQual => 1,
+			  CData => 2,
+			 };
+
+
+our $DATA_VERSION = 1;
+
 our @ISA = qw(DXChannel);
 
 our $startup_delay = 5*60;		# don't send anything out until this timer has expired
                                 # this is to allow the feed to "warm up" with duplicates
                                 # so that the "big rush" doesn't happen.
 
-our $minspottime = 60*60;		# the time between respots of a callsign - if a call is
+our $minspottime = 15*60;		# the time between respots of a callsign - if a call is
                                 # still being spotted (on the same freq) and it has been
                                 # spotted before, it's spotted again after this time
                                 # until the next minspottime has passed.
@@ -48,20 +86,25 @@ my %runtime;					# how long each channel has been running
 our $cachefn = localdata('rbn_cache');
 our $cache_valid = 4*60;		# The cache file is considered valid if it is not more than this old
 
+our $maxqrgdiff = 10;			# the maximum
+our $minqual = 2;				# the minimum quality we will accept for output
+
 my $json;
 my $noinrush = 0;				# override the inrushpreventor if set
 
 sub init
 {
-	$json = JSON->new;
-	$spots = {};
+	$json = DXJSON->new;
 	if (check_cache()) {
 		$noinrush = 1;
+	} else {
+		$spots = {VERSION=>$DATA_VERSION};
 	}
 	if (defined $DB::VERSION) {
 		$noinrush = 1;
 		$json->indent(1);
 	}
+	
 }
 
 sub new 
@@ -92,6 +135,7 @@ sub new
 	$self->{showstats} = 0;
 	$self->{pingint} = 0;
 	$self->{nopings} = 0;
+	$self->{queue} = {};
 
 	return $self;
 }
@@ -164,9 +208,6 @@ sub normal
 	my @ans;
 #	my $spots = $self->{spot};
 	
-	# save this for them's that need it
-	my $rawline = $line;
-	
 	# remove leading and trailing spaces
 	chomp $line;
 	$line =~ s/^\s*//;
@@ -174,7 +215,7 @@ sub normal
 
 	# add base RBN
 
-	my $tim = $main::systime;
+	my $now = $main::systime;
 
 	# parse line
 	dbg "RBN:RAW,$line" if isdbg('rbnraw');
@@ -253,40 +294,64 @@ sub normal
 		# process to just the standard "message passing" which has been shown to be able to sustain over 5000 
 		# per second (limited by the test program's output and network speed, rather than DXSpider's handling).
 
-		my $nqrg = nearest(1, $qrg);  # normalised to nearest Khz
+		my $nearest = 1;
+		my $search = 5;
+		my $mult = 10;
+		my $tqrg = $qrg * $mult; 
+		my $nqrg = nearest($nearest, $tqrg);  # normalised to nearest Khz
+#		my $nqrg = nearest_even($qrg);  # normalised to nearest Khz
 		my $sp = "$call|$nqrg";		  # hopefully the skimmers will be calibrated at least this well!
-		my $spp = sprintf("$call|%d", $nqrg+1); # but, clearly, my hopes are rudely dashed
-		my $spm = sprintf("$call|%d", $nqrg-1); # in BOTH directions!
 
-		# do we have it?
-		my $spot = $spots->{$sp};
-		$spot = $spots->{$spp}, $sp = $spp, dbg(qq{RBN: SPP using $spp for $sp}) if isdbg('rbn') && !$spot && exists $spots->{$spp};
-		$spot = $spots->{$spm}, $sp = $spm, dbg(qq{RBN: SPM using $spm for $sp}) if isdbg('rbn') && !$spot && exists $spots->{$spm};
+		# find it?
+		my $cand = $spots->{$sp};
+		unless ($cand) {
+			my ($i, $new);
+			for ($i = $tqrg; !$cand && $i <= $tqrg+$search; $i += 1) {
+				$new = "$call|$i";
+				$cand = $spots->{$new}, last if exists $spots->{$new};
+			}
+			if ($cand) {
+				my $diff = $i - $tqrg;
+				dbg(qq{RBN: QRG Diff using $new (+$diff) for $sp for qrg $qrg}) if (isdbg('rbnqrg') || isdbg('rbn'));
+				$sp = $new;
+			}
+		}
+		unless ($cand) {
+			my ($i, $new);
+			for ($i = $tqrg; !$cand && $i >= $tqrg-$search; $i -= 1) {
+				$new = "$call|$i";
+				$cand = $spots->{$new}, last if exists $spots->{$new};
+			}
+			if ($cand) {
+				my $diff = $tqrg - $i;
+				dbg(qq{RBN: QRG Diff using $new (-$diff) for $sp for qrg $qrg}) if (isdbg('rbnqrg') || isdbg('rbn'));
+				$sp = $new;
+			}
+		}
 		
-
 		# if we have one and there is only one slot and that slot's time isn't expired for respot then return
 		my $respot = 0;
-		if ($spot && ref $spot) {
-			if (@$spot == 1) {
-				unless ($self->{minspottime} > 0 && $tim - $spot->[0] >= $self->{minspottime}) {
-					dbg("RBN: key: '$sp' call: $call qrg: $qrg DUPE \@ ". atime(int $spot->[0])) if isdbg('rbn');
+		if ($cand && ref $cand) {
+			if (@$cand <= CData) {
+				unless ($self->{minspottime} > 0 && $now - $cand->[CTime] >= $self->{minspottime}) {
+					dbg("RBN: key: '$sp' call: $call qrg: $qrg DUPE \@ ". atime(int $cand->[CTime])) if isdbg('rbn');
 					return;
 				}
 				
-				dbg("RBN: key: '$sp' RESPOTTING call: $call qrg: $qrg last seen \@ ". atime(int $spot->[0])) if isdbg('rbn');
-				undef $spot;	# it's about to be recreated (in one place)
+				dbg("RBN: key: '$sp' RESPOTTING call: $call qrg: $qrg last seen \@ ". atime(int $cand->[CTime])) if isdbg('rbn');
+				$cand->[CTime] = $now;
 				++$respot;
 			}
 
 			# otherwise we have a spot being built up at the moment
-		} elsif ($spot) {
-			dbg("RBN: key '$sp' = '$spot' not ref");
+		} elsif ($cand) {
+			dbg("RBN: key '$sp' = '$cand' not ref");
 			return;
 		}
 
 		# here we either have an existing spot record buildup on the go, or we need to create the first one
-		unless ($spot) {
-			$spots->{$sp} = $spot = [clock_gettime(CLOCK_REALTIME)];;
+		unless ($cand) {
+			$spots->{$sp} = $cand = [$now, 0];
 			dbg("RBN: key: '$sp' call: $call qrg: $qrg NEW" . ($respot ? ' RESPOT' : '')) if isdbg('rbn');
 		}
 
@@ -297,11 +362,11 @@ sub normal
 		# deal with the unix time
 		my ($hh,$mm) = $t =~ /(\d\d)(\d\d)Z$/;
 		my $utz = $hh*3600 + $mm*60 + $main::systime_daystart; # possible issue with late spot from previous day
-		$utz -= 86400 if $utz > $tim+3600;					   # too far ahead, drag it back one day
+		$utz -= 86400 if $utz > $now+3600;					   # too far ahead, drag it back one day
 
 		# create record and add into the buildup
 		my $r = [$origin, nearest(.1, $qrg), $call, $mode, $s, $t, $utz, $respot, $u];
-		my @s =  Spot::prepare($r->[1], $r->[2], $r->[6], '', $r->[0]);
+		my @s =  Spot::prepare($r->[RQrg], $r->[RCall], $r->[RUtz], '', $r->[ROrigin]);
 		if ($s[5] == 666) {
 			dbg("RBN: ERROR invalid prefix/callsign $call from $origin-# on $qrg, dumped");
 			return;
@@ -311,111 +376,25 @@ sub normal
 			my ($want, undef) = $self->{inrbnfilter}->it($s);
 			return unless $want;	
 		}
-		$r->[9] = \@s;
+		$r->[RSpotData] = \@s;
 
-		push @{$self->{queue}}, $sp if @$spot == 1; # queue the KEY (not the record)
+		++$self->{queue}->{$sp};# unless @$cand>= CData; # queue the KEY (not the record)
 
 		dbg("RBN: key: '$sp' ADD RECORD call: $call qrg: $qrg origin: $origin") if isdbg('rbn');
 
-		push @$spot, $r;
-
-		# At this point we run the queue to see if anything can be sent onwards to the punter
-		my $now = clock_gettime(CLOCK_REALTIME);
+		push @$cand, $r;
 
-		# now run the waiting queue which just contains KEYS ($call|$qrg)
-		foreach $sp (@{$self->{queue}}) {
-			my $cand = $spots->{$sp};
-			unless ($cand && $cand->[0]) {
-				dbg "RBN Cand " . ($cand ? 'def' : 'undef') . " [0] " . ($cand->[0] ? 'def' : 'undef') . " dwell $dwelltime";
-				next;
-			} 
-			if ($now >= $cand->[0] + $dwelltime ) {
-				# we have a candidate, create qualitee value(s);
-				unless (@$cand > 1) {
-					dbg "RBN: QUEUE key '$sp' MISSING RECORDS " . dd($cand) if isdbg 'rbn';
-					shift @{$self->{queue}};
-					next;
-				}
-				my $savedtime = shift @$cand; # save the start time
-				my $r = $cand->[0];
-				my $quality = @$cand;
-				$quality = 9 if $quality > 9;
-				$quality = "Q:$quality";
-				if (isdbg('progress')) {
-					my $s = "RBN: SPOT key: '$sp' = $r->[2] on $r->[1] by $r->[0] \@ $r->[5] $quality";
-					$s .=  " route: $self->{call}";
-					dbg($s);
-				}
-				
-				send_dx_spot($self, $quality, $cand);
-				
-				# clear out the data and make this now just "spotted", but no further action required until respot time
-				dbg "RBN: QUEUE key '$sp' cleared" if isdbg 'rbn';
-				
-				$spots->{$sp} = [$savedtime];
-				shift @{$self->{queue}};
-			} else {
-				dbg sprintf("RBN: QUEUE key: '$sp' SEND time not yet reached %.1f secs left", $spot->[0] + $dwelltime - $now) if isdbg 'rbnqueue'; 
-			}
-		}
 	} else {
 		dbg "RBN:DATA,$line" if isdbg('rbn');
 	}
 }
 
-sub per_minute
-{
-	foreach my $dxchan (DXChannel::get_all()) {
-		next unless $dxchan->is_rbn;
-		dbg "RBN:STATS minute $dxchan->{call} raw: $dxchan->{noraw} sent: $dxchan->{norbn} delivered: $dxchan->{nospot} users: " . scalar keys %{$dxchan->{nousers}} if isdbg('rbnstats');
-		if ($dxchan->{noraw} == 0 && $dxchan->{lasttime} > 60) {
-			LogDbg('RBN', "RBN: no input from $dxchan->{call}, disconnecting");
-			$dxchan->disconnect;
-		}
-		$dxchan->{noraw} = $dxchan->{norbn} = $dxchan->{nospot} = 0; $dxchan->{nousers} = {};
-		$runtime{$dxchan->{call}} += 60;
-	}
-
-	# save the spot cache
-	write_cache() unless $main::systime + $startup_delay < $main::systime;;
-}
-
-sub per_10_minute
-{
-	my $count = 0;
-	my $removed = 0;
-	while (my ($k,$v) = each %{$spots}) {
-		if ($main::systime - $v->[0] > $minspottime*2) {
-			delete $spots->{$k};
-			++$removed;
-		}
-		else {
-			++$count;
-		}
-	}
-	dbg "RBN:STATS spot cache remain: $count removed: $removed"; # if isdbg('rbn');
-	foreach my $dxchan (DXChannel::get_all()) {
-		next unless $dxchan->is_rbn;
-		dbg "RBN:STATS 10-minute $dxchan->{call} raw: $dxchan->{noraw10} sent: $dxchan->{norbn10} delivered: $dxchan->{nospot10} users: " . scalar keys %{$dxchan->{nousers10}};
-		$dxchan->{noraw10} = $dxchan->{norbn10} = $dxchan->{nospot10} = 0; $dxchan->{nousers10} = {};
-	}
-}
-
-sub per_hour
-{
-	foreach my $dxchan (DXChannel::get_all()) {
-		next unless $dxchan->is_rbn;
-		dbg "RBN:STATS hour $dxchan->{call} raw: $dxchan->{norawhour} sent: $dxchan->{norbnhour} delivered: $dxchan->{nospothour} users: " . scalar keys %{$dxchan->{nousershour}};
-		$dxchan->{norawhour} = $dxchan->{norbnhour} = $dxchan->{nospothour} = 0; $dxchan->{nousershour} = {};
-	}
-}
-
 # we should get the spot record minus the time, so just an array of record (arrays)
 sub send_dx_spot
 {
 	my $self = shift;
 	my $quality = shift;
-	my $spot = shift;
+	my $cand = shift;
 
 	++$self->{norbn};
 	++$self->{norbn10};
@@ -423,7 +402,7 @@ sub send_dx_spot
 	
 	# $r = [$origin, $qrg, $call, $mode, $s, $utz, $respot];
 
-	my $mode = $spot->[0]->[3]; # as all the modes will be the same;
+	my $mode = $cand->[CData]->[RMode]; # as all the modes will be the same;
 	
 	my @dxchan = DXChannel::get_all();
 
@@ -450,7 +429,7 @@ sub send_dx_spot
 				   )) if isdbg('rbnll');
 
 		# send one spot to one user out of the ones that we have
-		$self->dx_spot($dxchan, $quality, $spot) if $want;
+		$self->dx_spot($dxchan, $quality, $cand) if $want;
 	}
 }
 
@@ -459,7 +438,7 @@ sub dx_spot
 	my $self = shift;
 	my $dxchan = shift;
 	my $quality = shift;
-	my $spot = shift;
+	my $cand = shift;
 	my $call = $dxchan->{call};
 	
 
@@ -474,45 +453,52 @@ sub dx_spot
 	++$self->{nousers}->{$call};
 	++$self->{nousers10}->{$call};
 	++$self->{nousershour}->{$call};
+
+	my $filtered;
+	my $rf = $dxchan->{rbnfilter} || $dxchan->{spotsfilter};
+	my $comment;
 	
-	foreach my $r (@$spot) {
+	foreach my $r (@$cand) {
 		# $r = [$origin, $qrg, $call, $mode, $s, $t, $utz, $respot, $qra];
 		# Spot::prepare($qrg, $call, $utz, $comment, $origin);
+		next unless ref $r;
 
-		my $comment = sprintf "%-3s %2ddB $quality", $r->[3], $r->[4];
-		$respot = 1 if $r->[7];
-		$qra = $r->[8] if !$qra && $r->[8] && is_qra($r->[8]);
+		$respot = 1 if $r->[Respot];
+		$qra = $r->[RQra] if !$qra && $r->[RQra] && is_qra($r->[RQra]);
 
-		my $s = $r->[9];		# the prepared spot
-		$s->[3] = $comment;		# apply new generated comment
+		$comment = sprintf "%-3s %2ddB $quality", $r->[RMode], $r->[RStrength];
+		my $s = $r->[RSpotData];		# the prepared spot
+		$s->[SComment] = $comment;		# apply new generated comment
 		
 		
-		++$zone{$s->[11]};		# save the spotter's zone
-		++$qrg{$s->[0]};		# and the qrg
+		++$zone{$s->[SZone]};		# save the spotter's zone
+		++$qrg{$s->[SQrg]};		# and the qrg
 
  
-		my $want = 0;
-		my $rf = $dxchan->{rbnfilter} || $dxchan->{spotsfilter};
-		if ($rf) {
-			($want, undef) = $rf->it($s);
-			next unless $want;
+		# save the lowest strength one
+		if ($r->[RStrength] < $strength) {
+			$strength = $r->[RStrength];
 			$saver = $s;
-			dbg("RBN: FILTERED call: $s->[1] qrg: $s->[0] origin: $s->[4] dB: $r->[4]") if isdbg 'rbn';
-			last;
+			dbg("RBN: STRENGTH spot: $s->[SCall] qrg: $s->[SQrg] origin: $s->[SOrigin] dB: $r->[RStrength] < $strength") if isdbg 'rbnll';
 		}
 
-		# save the lowest strength one
-		if ($r->[4] < $strength) {
-			$strength = $r->[4];
-			$saver = $s;
-			dbg("RBN: STRENGTH call: $s->[1] qrg: $s->[0] origin: $s->[4] dB: $r->[4]") if isdbg 'rbn';
+		if ($rf) {
+			my ($want, undef) = $rf->it($s);
+			dbg("RBN: FILTERING for $call spot: $s->[SCall] qrg: $s->[SQrg] origin: $s->[SOrigin] dB: $r->[RStrength] com: '$s->[SComment]' want: " . ($want ? 'YES':'NO')) if isdbg 'rbnll';
+			next unless $want;
+			$filtered = $s;
+#			last;
 		}
 	}
 
+	if ($rf) {
+		$saver = $filtered;		# if nothing passed the filter's lips then $saver == $filtered == undef !
+	}
+	
 	if ($saver) {
 		my $buf;
 		# create a zone list of spotters
-		delete $zone{$saver->[11]};  # remove this spotter's zone (leaving all the other zones)
+		delete $zone{$saver->[SZone]};  # remove this spotter's zone (leaving all the other zones)
 		my $z = join ',', sort {$a <=> $b} keys %zone;
 
 		# determine the most likely qrg and then set it
@@ -523,23 +509,26 @@ sub dx_spot
 			$fk = $k, $mv = $v if $v > $mv;
 			++$c;
 		}
-		$saver->[0] = $fk;
-		$saver->[3] .= '*' if $c > 1;
-		$saver->[3] .= '+' if $respot;
-		$saver->[3] .= " Z:$z" if $z;
+		$saver->[SQrg] = $fk;
+		$saver->[SComment] .= '*' if $c > 1;
+		$saver->[SComment] .= '+' if $respot;
+		$saver->[SComment] .= " Z:$z" if $z;
+		if ($c > 1 && (isdbg('rbnqrg') || isdbg('rbn'))) {
+			
+		}
 		
-		dbg("RBN: SENDING call: $saver->[1] qrg: $saver->[0] origin: $saver->[4] $saver->[3]") if isdbg 'rbn';
+		dbg("RBN: SENDING to $call spot: $saver->[SCall] qrg: $saver->[SQrg] origin: $saver->[SOrigin] $saver->[SComment]") if isdbg 'rbnll';
 		if ($dxchan->{ve7cc}) {
-			my $call = $saver->[4];
-			$saver->[4] .= '-#';
+			my $call = $saver->[SOrigin];
+			$saver->[SOrigin] .= '-#';
 			$buf = VE7CC::dx_spot($dxchan, @$saver);
-			$saver->[4] = $call;
+			$saver->[SOrigin] = $call;
 		} else {
-			my $call = $saver->[4];
-			$saver->[4] = substr($call, 0, 6);
-			$saver->[4] .= '-#';
+			my $call = $saver->[SOrigin];
+			$saver->[SOrigin] = substr($call, 0, 6);
+			$saver->[SOrigin] .= '-#';
 			$buf = $dxchan->format_dx_spot(@$saver);
-			$saver->[4] = $call;
+			$saver->[SOrigin] = $call;
 		}
 #		$buf =~ s/^DX/RB/;
 		$dxchan->local_send('N', $buf);
@@ -549,16 +538,118 @@ sub dx_spot
 		++$self->{nospothour};
 		
 		if ($qra) {
-			my $user = DXUser::get_current($saver->[1]) || DXUser->new($saver->[1]);
+			my $user = DXUser::get_current($saver->[SCall]) || DXUser->new($saver->[SCall]);
 			unless ($user->qra && is_qra($user->qra)) {
 				$user->qra($qra);
-				dbg("RBN: update qra on $saver->[1] to $qra");
+				dbg("RBN: update qra on $saver->[SCall] to $qra");
 				$user->put;
 			}
 		}
 	}
 }
 
+# per second
+sub process
+{
+	foreach my $dxchan (DXChannel::get_all()) {
+		next unless $dxchan->is_rbn;
+		
+		# At this point we run the queue to see if anything can be sent onwards to the punter
+		my $now = $main::systime;
+
+		# now run the waiting queue which just contains KEYS ($call|$qrg)
+		foreach my $sp (keys %{$dxchan->{queue}}) {
+			my $cand = $spots->{$sp};
+			unless ($cand && $cand->[CTime]) {
+				dbg "RBN Cand $sp " . ($cand ? 'def' : 'undef') . " [CTime] " . ($cand->[CTime] ? 'def' : 'undef') . " dwell $dwelltime";
+				next;
+			} 
+			if ($now >= $cand->[CTime] + $dwelltime ) {
+				# we have a candidate, create qualitee value(s);
+				unless (@$cand > CData) {
+					dbg "RBN: QUEUE key '$sp' MISSING RECORDS, IGNORED" . dd($cand) if isdbg 'rbn';
+					next;
+				}
+				dbg "RBN: QUEUE PROCESSING key: '$sp' $now >= $cand->[CTime]" if isdbg 'rbnqueue'; 
+				my $r = $cand->[CData];
+				my $quality = @$cand - CData;
+				$quality = 9 if $quality > 9;
+				$cand->[CQual] = $quality if $quality > $cand->[CQual];
+				my $squality = "Q:$cand->[CQual]";
+
+				if ($cand->[CQual] >= $minqual) {
+					if (isdbg('progress')) {
+						my $s = "RBN: SPOT key: '$sp' = $r->[RCall] on $r->[RQrg] by $r->[ROrigin] \@ $r->[RTime] $squality route: $dxchan->{call}";
+						dbg($s);
+					}
+					send_dx_spot($dxchan, $squality, $cand);
+				} elsif (isdbg('rbn')) {
+					my $s = "RBN: SPOT IGNORED(Q $cand->[CQual] < $minqual) key: '$sp' = $r->[RCall] on $r->[RQrg] by $r->[ROrigin] \@ $r->[RTime] $squality route: $dxchan->{call}";
+					dbg($s);
+				}
+				
+				# clear out the data and make this now just "spotted", but no further action required until respot time
+				dbg "RBN: QUEUE key '$sp' cleared" if isdbg 'rbn';
+				
+				$spots->{$sp} = [$now, $cand->[CQual]];
+				delete $dxchan->{queue}->{$sp};
+			} else {
+				dbg sprintf("RBN: QUEUE key: '$sp' SEND time not yet reached %.1f secs left", $cand->[CTime] + $dwelltime - $now) if isdbg 'rbnqueue'; 
+			}
+		}
+	}
+	
+}
+
+sub per_minute
+{
+	foreach my $dxchan (DXChannel::get_all()) {
+		next unless $dxchan->is_rbn;
+		dbg "RBN:STATS minute $dxchan->{call} raw: $dxchan->{noraw} sent: $dxchan->{norbn} delivered: $dxchan->{nospot} users: " . scalar keys %{$dxchan->{nousers}} if isdbg('rbnstats');
+		if ($dxchan->{noraw} == 0 && $dxchan->{lasttime} > 60) {
+			LogDbg('RBN', "RBN: no input from $dxchan->{call}, disconnecting");
+			$dxchan->disconnect;
+		}
+		$dxchan->{noraw} = $dxchan->{norbn} = $dxchan->{nospot} = 0; $dxchan->{nousers} = {};
+		$runtime{$dxchan->{call}} += 60;
+	}
+
+	# save the spot cache
+	write_cache() unless $main::systime + $startup_delay < $main::systime;;
+}
+
+sub per_10_minute
+{
+	my $count = 0;
+	my $removed = 0;
+	while (my ($k,$cand) = each %{$spots}) {
+		if ($main::systime - $cand->[CTime] > $minspottime*2) {
+			delete $spots->{$k};
+			++$removed;
+		}
+		else {
+			++$count;
+		}
+	}
+	dbg "RBN:STATS spot cache remain: $count removed: $removed"; # if isdbg('rbn');
+	foreach my $dxchan (DXChannel::get_all()) {
+		next unless $dxchan->is_rbn;
+		my $nq = keys %{$dxchan->{queue}};
+		dbg "RBN:STATS 10-minute $dxchan->{call} queue: $nq raw: $dxchan->{noraw10} sent: $dxchan->{norbn10} delivered: $dxchan->{nospot10} users: " . scalar keys %{$dxchan->{nousers10}};
+		$dxchan->{noraw10} = $dxchan->{norbn10} = $dxchan->{nospot10} = 0; $dxchan->{nousers10} = {};
+	}
+}
+
+sub per_hour
+{
+	foreach my $dxchan (DXChannel::get_all()) {
+		next unless $dxchan->is_rbn;
+		my $nq = keys %{$dxchan->{queue}};
+		dbg "RBN:STATS hour $dxchan->{call} queue: $nq raw: $dxchan->{norawhour} sent: $dxchan->{norbnhour} delivered: $dxchan->{nospothour} users: " . scalar keys %{$dxchan->{nousershour}};
+		$dxchan->{norawhour} = $dxchan->{norbnhour} = $dxchan->{nospothour} = 0; $dxchan->{nousershour} = {};
+	}
+}
+
 sub finish
 {
 	write_cache();
@@ -593,9 +684,18 @@ sub check_cache
 			}
 			if ($s) {
 				eval {$spots = $json->decode($s)};
-				if ($spots && ref $spots) {
-					dbg("RBN:check_cache spot cache restored");
-					return 1;
+				if ($spots && ref $spots) {	
+					if (exists $spots->{VERSION} && $spots->{VERSION} == $DATA_VERSION) {
+						# now clean out anything that is current
+						while (my ($k, $cand) = each %$spots) {
+							next unless ref $cand;
+							if (@$cand > CData) {
+								$spots->{$k} = [$cand->[CTime], $cand->[CQual]];
+							}
+						}
+						dbg("RBN:check_cache spot cache restored");
+						return 1;
+					} 
 				}
 			}
 			dbg("RBN::checkcache error decoding $@");