backport mojo console.pl width/scolling changes

[spider.git] / perl / DXUser.pm

diff --git a/perl/DXUser.pm b/perl/DXUser.pm
index 06075151fc97520b12a4104cb28a62d5405b19d5..3ea1282379eedfde361913de7e50291928bb21e4 100644 (file)
--- a/perl/DXUser.pm
+++ b/perl/DXUser.pm
@@ -80,6 +80,7 @@ $v3 = 0;
                  wantdxcq => '0,Show CQ Zone,yesno',
                  wantdxitu => '0,Show ITU Zone,yesno',
                  wantgtk => '0,Want GTK interface,yesno',
+                 wantpc9x => '0,Want PC9X interface,yesno',
                  lastoper => '9,Last for/oper,cldatetime',
                  nothere => '0,Not Here Text',
                  registered => '9,Registered?,yesno',
@@ -88,6 +89,8 @@ $v3 = 0;
                  build => '1,Build',
                  believe => '1,Believable nodes,parray',
                  lastping => '1,Last Ping at,ptimelist',
+                 maxconnect => '1,Max Connections',
+                 width => '0,Preferred Width',
                 );
 
 #no strict;
@@ -236,17 +239,26 @@ sub new
 
 sub get
 {
-       my $pkg = shift;
        my $call = uc shift;
        my $data;
        
        # 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);
+               $ref = eval{decode($data)};
+               if ($ref) {
+                       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 of $call $! $@");
+                       return undef;
+               }
                $lru->put($call, $ref);
                return $ref;
        }
@@ -263,14 +275,16 @@ sub get
 
 sub get_current
 {
-       my $pkg = shift;
        my $call = uc shift;
   
        my $dxchan = DXChannel::get($call);
-       return $dxchan->user if $dxchan;
-       my $rref = Route::get($call);
-       return $rref->user if $rref && exists $rref->{user};
-       return $pkg->get($call);
+       if ($dxchan) {
+               my $ref = $dxchan->user;
+               return $ref if $ref && UNIVERSAL::isa($ref, 'DXUser');
+
+               dbg("DXUser::get_current: got invalid user ref for $call from dxchan $dxchan->{call} ". ref $ref. " ignoring");
+       }
+       return get($call);
 }
 
 #
@@ -291,13 +305,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);
@@ -324,7 +336,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;
 }
 
 #
@@ -351,10 +376,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);
 }
@@ -396,13 +417,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;
@@ -503,7 +525,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");
@@ -716,6 +738,11 @@ sub wantgtk
        return _want('gtk', @_);
 }
 
+sub wantpc9x
+{
+       return _want('pc9x', @_);
+}
+
 sub wantlogininfo
 {
        my $self = shift;