X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FRBN.pm;h=a3567f80aeeb3f6685b9ff21b3340764adc160b8;hb=4478818ad569a966b732159facc4ed6674bb534b;hp=5e6a8a6486a584b259756143bccda67788d0975c;hpb=b957ee3a2ee3b33d33b9be23c42b6277d63eae01;p=spider.git

diff --git a/perl/RBN.pm b/perl/RBN.pm
index 5e6a8a64..a3567f80 100644
--- a/perl/RBN.pm
+++ b/perl/RBN.pm
@@ -22,15 +22,17 @@ use Time::HiRes qw(clock_gettime CLOCK_REALTIME);
 
 our @ISA = qw(DXChannel);
 
-our $startup_delay =0;#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).
 
@@ -53,6 +55,7 @@ sub new
 	$self->{sort} = 'N';
 	$self->{lasttime} = $main::systime;
 	$self->{minspottime} = $minspottime;
+	$self->{beacontime} = $beacontime;
 	$self->{showstats} = 0;
 
 	return $self;
@@ -211,31 +214,39 @@ sub normal
 
 		# do we have it?
 		my $spot = $spots->{$sp};
-		$spot = $spots->{$spp} if !$spot && exists $spots->{$spp};
-		$spot = $spots->{$spm} if !$spot && exists $spots->{$spm};
+		$spot = $spots->{$spp}, $sp = $spp, dbg('RBN: SPP using $spp for $sp') if !$spot && exists $spots->{$spp};
+		$spot = $spots->{$spm}, $sp = $spm, dbg('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
 		my $respot = 0;
-		if ($spot && @$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');
-				return;
+		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');
+					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)
+				++$respot;
 			}
-			dbg("RBN: key: '$sp' RESPOTTING call: $call qrg: $qrg last seen \@ ". atime(int $spot->[0])) if isdbg('rbn');
-			++$respot;
+
+			# otherwise we have a spot being built up at the moment
+		} elsif ($spot) {
+			dbg("RBN: key '$sp' = '$spot' 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) {
-			$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
 		return unless $self->{inrushpreventor} < $main::systime;
-		push @queue, $sp if @$spot == 1; # queue the KEY (not the record)
+		push @{$self->{queue}}, $sp if @$spot == 1; # queue the KEY (not the record)
 
 		# build up a new record and store it in the buildup
 		# deal with the unix time
@@ -244,7 +255,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;
@@ -253,13 +264,17 @@ sub normal
 		my $now = clock_gettime(CLOCK_REALTIME);
 
 		# now run the waiting queue which just contains KEYS ($call|$qrg)
-		foreach $sp (@queue) {
+		foreach $sp (@{$self->{queue}}) {
 			my $cand = $spots->{$sp};
-			if ($now >= $cand->[0]+$dwelltime ) {
+			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 @queue;
+					shift @{$self->{queue}};
 					next;
 				}
 				my $savedtime = shift @$cand; # save the start time
@@ -279,7 +294,7 @@ sub normal
 				dbg "RBN: QUEUE key '$sp' cleared" if isdbg 'rbn';
 				
 				$spots->{$sp} = [$savedtime];
-				shift @queue;
+				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'; 
 			}
@@ -363,19 +378,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];
@@ -416,12 +433,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;
+			}
+		}
 	}
 }