X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FRBN.pm;h=b95f637288b4af1d3be834186c94b39af91b0449;hb=1b28f13d136ceecc638e66fa427f226bdca83346;hp=a3f17e7eefbe3188cc4119bc8c8eca90773bbac4;hpb=6cfb34f5b5ac6eea2092f7df8bf03ae69a4385a9;p=spider.git

diff --git a/perl/RBN.pm b/perl/RBN.pm
index a3f17e7e..b95f6372 100644
--- a/perl/RBN.pm
+++ b/perl/RBN.pm
@@ -19,21 +19,26 @@ use DXChannel;
 use Math::Round qw(nearest);
 use Date::Parse;
 use Time::HiRes qw(clock_gettime CLOCK_REALTIME);
+use Spot;
 
 our @ISA = qw(DXChannel);
 
-our $startup_delay = 3*60; 		# don't send anything out until this timer has expired
+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. 
+                                # so that the "big rush" doesn't happen.
 
 our $minspottime = 60*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.
 
+our $beacontime = 5*60;			# same as minspottime, but for beacons (and shorter)
+
 our $dwelltime = 6; 			# the amount of time to wait for duplicates before issuing
                                 # a spot to the user (no doubt waiting with bated breath).
 
+our $filterdef = $Spot::filterdef; # we use the same filter as the Spot system. Can't think why.
+
 
 sub new 
 {
@@ -53,6 +58,7 @@ sub new
 	$self->{sort} = 'N';
 	$self->{lasttime} = $main::systime;
 	$self->{minspottime} = $minspottime;
+	$self->{beacontime} = $beacontime;
 	$self->{showstats} = 0;
 
 	return $self;
@@ -211,8 +217,8 @@ sub normal
 
 		# do we have it?
 		my $spot = $spots->{$sp};
-		$spot = $spots->{$spp}, $sp = $spp, dbg('SPP') if !$spot && exists $spots->{$spp};
-		$spot = $spots->{$spm}, $sp = $spm, dbg('SPM') if !$spot && exists $spots->{$spm};
+		$spot = $spots->{$spp}, $sp = $spp, dbg(qq{RBN: SPP using $spp for $sp}) if !$spot && exists $spots->{$spp};
+		$spot = $spots->{$spm}, $sp = $spm, dbg(qq{RBN: SPM using $spm for $sp}) if !$spot && exists $spots->{$spm};
 		
 
 		# if we have one and there is only one slot and that slot's time isn't expired for respot then return
@@ -225,8 +231,11 @@ sub normal
 				}
 				
 				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)
 				++$respot;
 			}
+
+			# otherwise we have a spot being built up at the moment
 		} elsif ($spot) {
 			dbg("RBN: key '$sp' = '$spot' not ref");
 			return;
@@ -234,9 +243,8 @@ sub normal
 
 		# here we either have an existing spot record buildup on the go, or we need to create the first one
 		unless ($spot) {
-			$spot = [clock_gettime(CLOCK_REALTIME)];
-			$spots->{$sp} = $spot;
-			dbg("RBN: key: '$sp' call: $call qrg: $qrg NEW") if isdbg('rbn');
+			$spots->{$sp} = $spot = [clock_gettime(CLOCK_REALTIME)];;
+			dbg("RBN: key: '$sp' call: $call qrg: $qrg NEW" . $respot ? ' RESPOT' : '') if isdbg('rbn');
 		}
 
 		# add me to the display queue unless we are waiting for initial in rush to finish
@@ -250,7 +258,7 @@ sub normal
 		$utz -= 86400 if $utz > $tim+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];
+		my $r = [$origin, nearest(.1, $qrg), $call, $mode, $s, $t, $utz, $respot, $u];
 		dbg("RBN: key: '$sp' ADD RECORD call: $call qrg: $qrg origin: $origin") if isdbg('rbn');
 
 		push @$spot, $r;
@@ -313,7 +321,7 @@ sub normal
 				++$count;
 			}
 		}
-		dbg "RBN:ADMIN,spot cache: $removed removed $count remain"; # if isdbg('rbn');
+		dbg "RBN:ADMIN,$self->{call},spot cache remain: $count removed: $removed"; # if isdbg('rbn');
 		dbg "RBN:" . join(',', "STAT", $self->{noraw}, $self->{norbn}, $self->{nospot}) if $self->{showstats};
 		$self->{noraw} = $self->{norbn} = $self->{nospot} = 0;
 		$self->{last} = int($tim / 60) * 60;
@@ -373,25 +381,21 @@ sub dx_spot
 	my %zone;
 	my %qrg;
 	my $respot;
-	
-	
+	my $qra;
+		
 	foreach my $r (@$spot) {
-		# $r = [$origin, $qrg, $call, $mode, $s, $t, $utz, $respot];
+		# $r = [$origin, $qrg, $call, $mode, $s, $t, $utz, $respot, $qra];
 		# Spot::prepare($qrg, $call, $utz, $comment, $origin);
 
 		my $comment = sprintf "%-3s %2ddB $quality", $r->[3], $r->[4];
-		my @s =  Spot::prepare($r->[1], $r->[2], $r->[6], $comment, $r->[0]);
 		$respot = 1 if $r->[7];
+		$qra = $r->[8] if !$qra && $r->[8] && is_qra($r->[8]);
+
+		my @s =  Spot::prepare($r->[1], $r->[2], $r->[6], $comment, $r->[0]);
+
 		++$zone{$s[11]};		# save the spotter's zone
 		++$qrg{$s[0]};			# and the qrg
-		
-		
-		# save the highest 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';
-		}
+
  
 		my $filter = 0;
 
@@ -403,6 +407,12 @@ sub dx_spot
 			last;
 		}
 
+		# 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 ($saver) {
@@ -426,12 +436,24 @@ sub dx_spot
 		
 		dbg("RBN: SENDING call: $saver->[1] qrg: $saver->[0] origin: $saver->[4] $saver->[3]") if isdbg 'rbn';
 		if ($dxchan->{ve7cc}) {
+			my $call = $saver->[1];
+			$saver->[1] .= '-#';
 			$buf = VE7CC::dx_spot($dxchan, @$saver);
+			$saver->[1] = $call;
 		} else {
 			$buf = $dxchan->format_dx_spot(@$saver);
 		}
 		$buf =~ s/^DX/RB/;
 		$dxchan->local_send('N', $buf);
+
+		if ($qra) {
+			my $user = DXUser::get_current($saver->[1]) || DXUser->new($saver->[1]);
+			unless ($user->qra && is_qra($user->qra)) {
+				$user->qra($qra);
+				dbg("RBN: update qra on $saver->[1] to $qra");
+				$user->put;
+			}
+		}
 	}
 }