use Math::Round qw(nearest);
use Date::Parse;
use Time::HiRes qw(clock_gettime CLOCK_REALTIME);
+use Spot;
our @ISA = qw(DXChannel);
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
{
my $pkg = shift;
my $call = shift;
- DXProt::_add_thingy($main::routeroot, [$call, 0, 0, 1, undef, undef, $self->hostname], );
- $self->{d} = {};
+# DXProt::_add_thingy($main::routeroot, [$call, 0, 0, 1, undef, undef, $self->hostname], );
$self->{spot} = {};
$self->{last} = 0;
$self->{noraw} = 0;
my $user = $self->{user};
my $call = $self->{call};
my $name = $user->{name};
- my $dref = $self->{d};
- my $spotref = $self->{spot};
# log it
my $host = $self->{conn}->peerhost;
# get the filters
my $nossid = $call;
$nossid =~ s/-\d+$//;
-
- $self->{spotsfilter} = Filter::read_in('spots', $call, 0)
- || Filter::read_in('spots', $nossid, 0)
- || Filter::read_in('spots', 'user_default', 0);
+ $self->{inrbnfilter} = Filter::read_in('rbn', $call, 1)
+ || Filter::read_in('rbn', 'node_default', 1);
+
# clean up qra locators
my $qra = $user->qra;
$qra = undef if ($qra && !DXBearing::is_qra($qra));
# 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
}
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;
# 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
# create record and add into the buildup
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');
+ my @s = Spot::prepare($r->[1], $r->[2], $r->[6], '', $r->[0]);
+ if ($self->{inrbnfilter}) {
+ my ($want, undef) = $self->{inrbnfilter}->it($s);
+ next unless $want;
+ }
+ $r->[9] = \@s;
push @$spot, $r;
++$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;
$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
+ my $s = $r->[9]; # the prepared spot
+ $s->[3] = $comment; # apply new generated comment
+
+
+ ++$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;
-
- if ($dxchan->{rbnfilter}) {
- ($filter, undef) = $dxchan->{rbnfilter}->it(\@s);
- next unless $filter;
- $saver = \@s;
- dbg("RBN: FILTERED call: $s[1] qrg: $s[0] origin: $s[4] dB: $r->[4]") if isdbg 'rbn';
+ my $want = 0;
+ my $rf = $dxchan->{rbnfilter} || $dxchan->{spotsfilter};
+ if ($rf) {
+ ($want, undef) = $rf->it($s);
+ next unless $want;
+ $saver = $s;
+ dbg("RBN: FILTERED call: $s->[1] qrg: $s->[0] origin: $s->[4] dB: $r->[4]") if isdbg 'rbn';
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) {
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] .= '-#';
+ my $call = $saver->[4];
+ $saver->[4] .= '-#';
$buf = VE7CC::dx_spot($dxchan, @$saver);
- $saver->[1] = $call;
+ $saver->[4] = $call;
} else {
$buf = $dxchan->format_dx_spot(@$saver);
}
projects / spider.git / blobdiff