$allowzero $decode_dk0wcy);
$me = undef; # the channel id for this cluster
-$decode_dk0wcy = undef; # if set use this callsign to decode announces from the EU WWV data beacon
$pc11_max_age = 1*3600; # the maximum age for an incoming 'real-time' pc11
$pc23_max_age = 1*3600; # the maximum age for an incoming 'real-time' pc23
}
# are any of the crucial fields invalid?
- if ($field[2] =~ /[a-z]/ || $field[6] =~ /[a-z]/ || $field[7] =~ /[a-z]/) {
- dbg('chan', "Spot contains lower case callsigns, rejected");
+ if ($field[2] =~ /(?:^\s*$|[a-z])/ || $field[6] =~ /(?:^\s*$|[a-z])/ || $field[7] =~ /(?:^\s*$|[a-z])/) {
+ dbg('chan', "Spot contains lower case callsigns or blanks, rejected");
return;
}
# do some de-duping
+ $field[5] =~ s/^\s+//; # take any leading blanks off
if (Spot::dup($field[1], $field[2], $d, $field[5])) {
dbg('chan', "Duplicate Spot ignored\n");
return;
# you should be able to route on any of these
#
+ # fix up qra locators of known users
+ my $user = DXUser->get_current($spot[4]);
+ if ($user) {
+ my $qra = $user->qra;
+ if (!DXBearing::is_qra) {
+ my $lat = $user->lat;
+ my $long = $user->long;
+ if (defined $lat && defined $long) {
+ $user->qra(DXBearing::lltoqra($lat, $long));
+ $user->put;
+ }
+ }
+ }
+
# local processing
my $r;
eval {
if ($pcno == 12) { # announces
# announce duplicate checking
+ $field[3] =~ s/^\s+//; # remove leading blanks
if (AnnTalk::dup($field[1], $field[2], $field[3])) {
dbg('chan', "Duplicate Announce ignored\n");
return;
# send it
$self->send_announce($line, @field[1..6]);
-
- if ($decode_dk0wcy && $field[1] eq $decode_dk0wcy) {
- my ($hour, $k, $next, $a, $r, $sfi, $alarm) = $field[3] =~ /^Aurora Beacon\s+(\d+)UTC,\s+Kiel\s+K=(\d+),.*ed\s+K=(\d+),\s+A=(\d+),\s+R=(\d+),\s+SFI=(\d+),.*larm:\s+(\w+)/;
- $alarm = ($alarm =~ /^Y/i) ? ', Aurora in DE' : '';
- my $wwv = Geomag::update($main::systime, $hour, $sfi, $a, $k, "R=$r, Next K=$next$alarm", $decode_dk0wcy, $field[5], $r) if $sfi && $r;
- }
-
} else {
$self->route($field[2], $line);
}
my ($lat, $long) = DXBearing::stoll($field[3]);
$user->lat($lat);
$user->long($long);
+ my $qra = $user->qra || DXBearing::lltoqra($lat, $long);
+ $qra = DXBearing::lltoqra($lat, $long) unless DXBearing::is_qra($qra);
} elsif ($field[2] == 4) {
$user->homenode($field[3]);
}