build => '1,Build',
believe => '1,Believable nodes,parray',
lastping => '1,Last Ping at,ptimelist',
+ maxconnect => '1,Max Connections',
);
#no strict;
unless ($dbm->get($call, $data)) {
$ref = decode($data);
if ($ref) {
- if (ref $ref ne 'DXUser') {
- dbg("DXUser::get: got strange answer from decode ". ref $ref. " ignoring");
+ if (!UNIVERSAL::isa($ref, 'DXUser')) {
+ dbg("DXUser::get: got strange answer from decode of $call". ref $ref. " ignoring");
return undef;
}
+ # we have a reference and it *is* a DXUser
} else {
- dbg("DXUser::get: no reference returned from decode $!");
+ dbg("DXUser::get: no reference returned from decode of $call $!");
return undef;
}
$lru->put($call, $ref);
my $dxchan = DXChannel::get($call);
if ($dxchan) {
my $ref = $dxchan->user;
- return $ref if ref $ref eq 'DXUser';
+ return $ref if $ref && UNIVERSAL::isa($ref, 'DXUser');
- dbg("DXUser::get_current: got invalid user ref from dxchan $dxchan->{call} ". ref $ref. " ignoring");
+ dbg("DXUser::get_current: got invalid user ref for $call from dxchan $dxchan->{call} ". ref $ref. " ignoring");
}
return get($call);
}
my $self = shift;
confess "Trying to put nothing!" unless $self && ref $self;
my $call = $self->{call};
- # delete all instances of this
-# for ($dbm->get_dup($call)) {
-# $dbm->del_dup($call, $_);
-# }
+
$dbm->del($call);
delete $self->{annok} if $self->{annok};
delete $self->{dxok} if $self->{dxok};
+
$lru->put($call, $self);
my $ref = $self->encode;
$dbm->put($call, $ref);
sub asc_encode
{
my $self = shift;
- return dd($self);
+ my $strip = shift;
+ my $p;
+
+ if ($strip) {
+ my $ref = bless {}, ref $self;
+ foreach my $k (qw(qth lat long qra sort call homenode node lastoper lastin)) {
+ $ref->{$k} = $self->{$k} if exists $self->{$k};
+ }
+ $ref->{name} = $self->{name} if exists $self->{name} && $self->{name} !~ /selfspot/i;
+ $p = dd($ref);
+ } else {
+ $p = dd($self);
+ }
+ return $p;
}
#
{
my $self = shift;
my $call = $self->{call};
- # delete all instances of this
-# for ($dbm->get_dup($call)) {
-# $dbm->del_dup($call, $_);
-# }
$lru->remove($call);
$dbm->del($call);
}
sub export
{
my $fn = shift;
+ my $basic_info_only = shift;
# save old ones
- rename "$fn.oooo", "$fn.ooooo" if -e "$fn.oooo";
- rename "$fn.ooo", "$fn.oooo" if -e "$fn.ooo";
- rename "$fn.oo", "$fn.ooo" if -e "$fn.oo";
- rename "$fn.o", "$fn.oo" if -e "$fn.o";
- rename "$fn", "$fn.o" if -e "$fn";
+ rename "$fn.oooo", "$fn.ooooo" if -e "$fn.oooo";
+ rename "$fn.ooo", "$fn.oooo" if -e "$fn.ooo";
+ rename "$fn.oo", "$fn.ooo" if -e "$fn.oo";
+ rename "$fn.o", "$fn.oo" if -e "$fn.o";
+ rename "$fn", "$fn.o" if -e "$fn";
my $count = 0;
my $err = 0;
}
}
# only store users that are reasonably active or have useful information
- print $fh "$key\t" . $ref->asc_encode . "\n";
+ print $fh "$key\t" . $ref->asc_encode($basic_info_only) . "\n";
++$count;
} else {
LogDbg('DXCommand', "Export Error3: $key\t$val");