projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix error messaging in DXUser::init
[spider.git]
/
perl
/
DXProtHandle.pm
diff --git
a/perl/DXProtHandle.pm
b/perl/DXProtHandle.pm
index e268d0f9970b595d1a35df0da70c92ca335f826c..b3278d36a78a835405f2a72bf8adf68d4e7a142f 100644
(file)
--- a/
perl/DXProtHandle.pm
+++ b/
perl/DXProtHandle.pm
@@
-624,7
+624,7
@@
sub handle_18
$self->{build} = 0 + $build;
$self->user->build(0 + $build);
$parent->build(0 + $build);
$self->{build} = 0 + $build;
$self->user->build(0 + $build);
$parent->build(0 + $build);
- dbg("DXSpider version $version build $build");
+ dbg("
$self->{call} =
DXSpider version $version build $build");
unless ($self->is_spider) {
dbg("Change U " . $self->user->sort . " C $self->{sort} -> S");
$self->user->sort('S');
unless ($self->is_spider) {
dbg("Change U " . $self->user->sort . " C $self->{sort} -> S");
$self->user->sort('S');
@@
-633,7
+633,7
@@
sub handle_18
}
# $self->{handle_xml}++ if DXXml::available() && $pc->[1] =~ /\bxml/;
} else {
}
# $self->{handle_xml}++ if DXXml::available() && $pc->[1] =~ /\bxml/;
} else {
- dbg("
Unknown software
");
+ dbg("
$self->{call} = Unknown software ($pc->[1] $pc->[2])
");
$self->version(50.0);
$self->version($pc->[2] / 100) if $pc->[2] && $pc->[2] =~ /^\d+$/;
$self->user->version($self->version);
$self->version(50.0);
$self->version($pc->[2] / 100) if $pc->[2] && $pc->[2] =~ /^\d+$/;
$self->user->version($self->version);
@@
-641,12
+641,12
@@
sub handle_18
if ($pc->[1] =~ /\bpc9x/) {
if ($self->{isolate}) {
if ($pc->[1] =~ /\bpc9x/) {
if ($self->{isolate}) {
- dbg("
pc9x recognised, but $self->{call}
is isolated, using old protocol");
+ dbg("
$self->{call} pc9x recognised, but node
is isolated, using old protocol");
} elsif (!$self->user->wantpc9x) {
} elsif (!$self->user->wantpc9x) {
- dbg("
pc9x explicitly switched off on $self->{call}
, using old protocol");
+ dbg("
$self->{call} pc9x explicitly switched off
, using old protocol");
} else {
$self->{do_pc9x} = 1;
} else {
$self->{do_pc9x} = 1;
- dbg("
Do px9x set on $self->{call}
");
+ dbg("
$self->{call} Set do PC9x
");
}
}
}
}
@@
-663,13
+663,15
@@
sub check_add_node
# add this station to the user database, if required (don't remove SSID from nodes)
my $user = DXUser::get_current($call);
# add this station to the user database, if required (don't remove SSID from nodes)
my $user = DXUser::get_current($call);
-
if (!
$user) {
+
unless (
$user) {
$user = DXUser->new($call);
$user->priv(1); # I have relented and defaulted nodes
$user->lockout(1);
$user->homenode($call);
$user->node($call);
$user->sort('A');
$user = DXUser->new($call);
$user->priv(1); # I have relented and defaulted nodes
$user->lockout(1);
$user->homenode($call);
$user->node($call);
$user->sort('A');
+ $user->lastin($main::systime); # this make it last longer than just this invocation
+ $user->put; # just to make sure it gets written away!!!
}
return $user;
}
}
return $user;
}
@@
-973,7
+975,7
@@
sub handle_23
# note this only takes the first one it gets
Geomag::update($d, $pc->[2], $sfi, $k, $i, @$pc[6..8], $r);
# note this only takes the first one it gets
Geomag::update($d, $pc->[2], $sfi, $k, $i, @$pc[6..8], $r);
- dbg("WWV:
$d $pc->[2], sfi:$sfi k:$k info:$i $pc->[6] $pc->[7]
$pc->[8] $r route: $origin") if isdbg('progress');
+ dbg("WWV:
<$pc->[2]>, sfi=$sfi k=$k info=$i '$pc->[6]' $pc->[7]\@
$pc->[8] $r route: $origin") if isdbg('progress');
if (defined &Local::wwv) {
my $rep;
if (defined &Local::wwv) {
my $rep;
@@
-1377,7
+1379,7
@@
sub handle_73
}
my $wcy = WCY::update($d, @$pc[2..12]);
}
my $wcy = WCY::update($d, @$pc[2..12]);
- dbg("WCY:
" . join(', ', @$pc[2..12]) . "
route: $origin") if isdbg('progress');
+ dbg("WCY:
<$pc->[2]> K=$pc->[5] expK=$pc->[6] A=$pc->[4] R=$pc->[7] SFI=$pc->[3] SA=$pc->[8] GMF=$pc->[9] Au=$pc->[10] $pc->[11]\@$pc->[12]
route: $origin") if isdbg('progress');
if (defined &Local::wcy) {
my $rep;
if (defined &Local::wcy) {
my $rep;