projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add SQLite special
[spider.git]
/
perl
/
DXProt.pm
diff --git
a/perl/DXProt.pm
b/perl/DXProt.pm
index 5bf0d1f935f367fe3dfdc110b3986706bc90a0be..7f30ae62acd446da059cc45283cfe8e6af00bdfe 100644
(file)
--- a/
perl/DXProt.pm
+++ b/
perl/DXProt.pm
@@
-82,7
+82,7
@@
$pc19_version = 5466; # the visible version no for outgoing PC19s generated fr
@checklist =
(
[ qw(i c c m bp bc c) ], # pc10
@checklist =
(
[ qw(i c c m bp bc c) ], # pc10
- [ qw(i f
m d t m c c h) ],
# pc11
+ [ qw(i f
bm d t m c c h) ],
# pc11
[ qw(i c bm m bm bm p h) ], # pc12
[ qw(i c h) ], #
[ qw(i c h) ], #
[ qw(i c bm m bm bm p h) ], # pc12
[ qw(i c h) ], #
[ qw(i c h) ], #
@@
-1236,21
+1236,22
@@
sub handle_23
}
# global wwv filtering on INPUT
}
# global wwv filtering on INPUT
- my @dxcc = ((Prefix::cty_data($_[
6]))[0..2], (Prefix::cty_data($_[7
]))[0..2]);
+ my @dxcc = ((Prefix::cty_data($_[
7]))[0..2], (Prefix::cty_data($_[8
]))[0..2]);
if ($self->{inwwvfilter}) {
my ($filter, $hops) = $self->{inwwvfilter}->it(@_[7,8], $origin, @dxcc);
unless ($filter) {
if ($self->{inwwvfilter}) {
my ($filter, $hops) = $self->{inwwvfilter}->it(@_[7,8], $origin, @dxcc);
unless ($filter) {
- dbg("PCPROT: Rejected by input
spot
filter") if isdbg('chanerr');
+ dbg("PCPROT: Rejected by input
wwv
filter") if isdbg('chanerr');
return;
}
}
return;
}
}
- if (Geomag::dup($d,$sfi,$k,$i,$_[6])) {
+ $_[7] =~ s/-\d+$//o; # remove spotter's ssid
+ if (Geomag::dup($d,$sfi,$k,$i,$_[6],$_[7])) {
dbg("PCPROT: Dup WWV Spot ignored\n") if isdbg('chanerr');
return;
}
dbg("PCPROT: Dup WWV Spot ignored\n") if isdbg('chanerr');
return;
}
- $_[7] =~ s/-\d+$//o; # remove spotter's ssid
- my $wwv = Geomag::update($d, $_[2], $sfi, $k, $i, @_[6..8], $r);
+ # note this only takes the first one it gets
+ Geomag::update($d, $_[2], $sfi, $k, $i, @_[6..8], $r);
my $rep;
eval {
my $rep;
eval {