X-Git-Url: http://www.dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXUser.pm;h=94fa3d1a9ff1549fe2659b69444fef2915c565a9;hb=963ead7224e53e257c7c661683174a75c2935cda;hp=e2c24f598a5eee6d7fdd941ade20ac7f46cb0c78;hpb=ab811a0c902225075a9bd69749f65594079433a9;p=spider.git diff --git a/perl/DXUser.pm b/perl/DXUser.pm index e2c24f59..94fa3d1a 100644 --- a/perl/DXUser.pm +++ b/perl/DXUser.pm @@ -89,6 +89,7 @@ $v3 = 0; build => '1,Build', believe => '1,Believable nodes,parray', lastping => '1,Last Ping at,ptimelist', + maxconnect => '1,Max Connections', ); #no strict; @@ -242,14 +243,18 @@ sub get # is it in the LRU cache? my $ref = $lru->get($call); - return $ref if $ref; + return $ref if $ref && ref $ref eq 'DXUser'; # search for it unless ($dbm->get($call, $data)) { $ref = decode($data); - dbg("DXUser::get: data error on $call $!") unless $ref; - if ($ref && ref $ref ne 'DXUser') { - dbg("DXUser::get: got strange answer from decode ". ref $ref. " ignoring"); + if ($ref) { + if (ref $ref ne 'DXUser') { + dbg("DXUser::get: got strange answer from decode ". ref $ref. " ignoring"); + return undef; + } + } else { + dbg("DXUser::get: no reference returned from decode $!"); return undef; } $lru->put($call, $ref); @@ -271,7 +276,12 @@ sub get_current my $call = uc shift; my $dxchan = DXChannel::get($call); - return $dxchan->user if $dxchan; + if ($dxchan) { + my $ref = $dxchan->user; + return $ref if ref $ref eq 'DXUser'; + + dbg("DXUser::get_current: got invalid user ref from dxchan $dxchan->{call} ". ref $ref. " ignoring"); + } return get($call); } @@ -293,13 +303,11 @@ sub put 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); @@ -326,7 +334,20 @@ sub decode 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; } # @@ -353,10 +374,6 @@ sub del { 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); } @@ -398,13 +415,14 @@ sub fields 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; @@ -505,7 +523,7 @@ print "There are $count user records and $err errors\n"; } } # 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");