add RBN filtering

[spider.git] / perl / RBN.pm

diff --git a/perl/RBN.pm b/perl/RBN.pm
index f6c1bc5389144403d1944a465b6f716745116f27..b95f637288b4af1d3be834186c94b39af91b0449 100644 (file)
--- a/perl/RBN.pm
+++ b/perl/RBN.pm
@@ -19,6 +19,7 @@ use DXChannel;
 use Math::Round qw(nearest);
 use Date::Parse;
 use Time::HiRes qw(clock_gettime CLOCK_REALTIME);
+use Spot;
 
 our @ISA = qw(DXChannel);
 
@@ -36,6 +37,8 @@ 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 
 {
@@ -214,8 +217,8 @@ sub normal
 
                # do we have it?
                my $spot = $spots->{$sp};
-               $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};
+               $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
@@ -228,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;
@@ -237,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
@@ -316,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;
@@ -391,12 +396,6 @@ sub dx_spot
                ++$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;
 
@@ -408,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) {