add DXCIDR, fix version no tracking
[spider.git] / perl / DXUser.pm
index 413d56a6446c6678b779498498ef4bfd56146ef9..3c8f3daac286d434439febc9858ed02e9f13bc3e 100644 (file)
@@ -3,7 +3,7 @@
 #
 # Copyright (c) 1998 - Dirk Koopman G1TLH
 #
-# $Id$
+#
 #
 
 package DXUser;
@@ -19,12 +19,6 @@ use LRU;
 
 use strict;
 
-use vars qw($VERSION $BRANCH);
-$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
-$main::build += $VERSION;
-$main::branch += $BRANCH;
-
 use vars qw(%u $dbm $filename %valid $lastoperinterval $lasttime $lru $lrusize $tooold $v3);
 
 %u = ();
@@ -38,61 +32,66 @@ $v3 = 0;
 
 # hash of valid elements and a simple prompt
 %valid = (
-                 call => '0,Callsign',
-                 alias => '0,Real Callsign',
-                 name => '0,Name',
-                 qth => '0,Home QTH',
-                 lat => '0,Latitude,slat',
-                 long => '0,Longitude,slong',
-                 qra => '0,Locator',
-                 email => '0,E-mail Address,parray',
-                 priv => '9,Privilege Level',
-                 lastin => '0,Last Time in,cldatetime',
-                 passwd => '9,Password,yesno',
-                 passphrase => '9,Pass Phrase,yesno',
-                 addr => '0,Full Address',
                  'sort' => '0,Type of User', # A - ak1a, U - User, S - spider cluster, B - BBS
-                 xpert => '0,Expert Status,yesno',
+                 addr => '0,Full Address',
+                 alias => '0,Real Callsign',
+                 annok => '9,Accept Announces?,yesno', # accept his announces?
                  bbs => '0,Home BBS',
-                 node => '0,Last Node',
-                 homenode => '0,Home Node',
-                 lockout => '9,Locked out?,yesno',     # won't let them in at all
+                 believe => '1,Believable nodes,parray',
+                 buddies => '0,Buddies,parray',
+                 build => '1,Build',
+                 call => '0,Callsign',
                  dxok => '9,Accept DX Spots?,yesno', # accept his dx spots?
-                 annok => '9,Accept Announces?,yesno', # accept his announces?
-                 lang => '0,Language',
-                 hmsgno => '0,Highest Msgno',
+                 email => '0,E-mail Address,parray',
                  group => '0,Group,parray',    # used to create a group of users/nodes for some purpose or other
-                 buddies => '0,Buddies,parray',
+                 hmsgno => '0,Highest Msgno',
+                 homenode => '0,Home Node',
                  isolate => '9,Isolate network,yesno',
-                 wantbeep => '0,Req Beep,yesno',
+                 K => '9,Seen on PC92 K,yesno',
+                 lang => '0,Language',
+                 lastin => '0,Last Time in,cldatetime',
+                 lastoper => '9,Last for/oper,cldatetime',
+                 lastping => '1,Last Ping at,ptimelist',
+                 lat => '0,Latitude,slat',
+                 lockout => '9,Locked out?,yesno',     # won't let them in at all
+                 long => '0,Longitude,slong',
+                 maxconnect => '1,Max Connections',
+                 name => '0,Name',
+                 node => '0,Last Node',
+                 nopings => '9,Ping Obs Count',
+                 nothere => '0,Not Here Text',
+                 pagelth => '0,Current Pagelth',
+                 passphrase => '9,Pass Phrase,yesno',
+                 passwd => '9,Password,yesno',
+                 pingint => '9,Node Ping interval',
+                 priv => '9,Privilege Level',
+                 prompt => '0,Required Prompt',
+                 qra => '0,Locator',
+                 qth => '0,Home QTH',
+                 registered => '9,Registered?,yesno',
+                 version => '1,Version',
                  wantann => '0,Req Announce,yesno',
-                 wantwwv => '0,Req WWV,yesno',
-                 wantwcy => '0,Req WCY,yesno',
-                 wantecho => '0,Req Echo,yesno',
-                 wanttalk => '0,Req Talk,yesno',
-                 wantwx => '0,Req WX,yesno',
+                 wantann_talk => '0,Talklike Anns,yesno',
+                 wantbeep => '0,Req Beep,yesno',
                  wantdx => '0,Req DX Spots,yesno',
+                 wantdxcq => '0,Show CQ Zone,yesno',
+                 wantdxitu => '0,Show ITU Zone,yesno',
+                 wantecho => '0,Req Echo,yesno',
                  wantemail => '0,Req Msgs as Email,yesno',
-                 pagelth => '0,Current Pagelth',
-                 pingint => '9,Node Ping interval',
-                 nopings => '9,Ping Obs Count',
+                 wantgtk => '0,Want GTK interface,yesno',
                  wantlogininfo => '0,Login Info Req,yesno',
-          wantgrid => '0,Show DX Grid,yesno',
-                 wantann_talk => '0,Talklike Anns,yesno',
                  wantpc16 => '9,Want Users from node,yesno',
-                 wantsendpc16 => '9,Send PC16,yesno',
+                 wantpc9x => '0,Want PC9X interface,yesno',
                  wantroutepc19 => '9,Route PC19,yesno',
+                 wantsendpc16 => '9,Send PC16,yesno',
+                 wanttalk => '0,Req Talk,yesno',
                  wantusstate => '0,Show US State,yesno',
-                 wantdxcq => '0,Show CQ Zone,yesno',
-                 wantdxitu => '0,Show ITU Zone,yesno',
-                 lastoper => '9,Last for/oper,cldatetime',
-                 nothere => '0,Not Here Text',
-                 registered => '9,Registered?,yesno',
-                 prompt => '0,Required Prompt',
-                 version => '1,Version',
-                 build => '1,Build',
-                 believe => '1,Believable nodes,parray',
-                 lastping => '1,Last Ping at,ptimelist',
+                 wantwcy => '0,Req WCY,yesno',
+                 wantwwv => '0,Req WWV,yesno',
+                 wantwx => '0,Req WX,yesno',
+                 width => '0,Preferred Width',
+                 xpert => '0,Expert Status,yesno',
+          wantgrid => '0,Show DX Grid,yesno',
                 );
 
 #no strict;
@@ -241,17 +240,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;
        }
@@ -268,14 +276,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);
 }
 
 #
@@ -296,13 +306,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);
@@ -329,11 +337,20 @@ sub decode
 sub asc_encode
 {
        my $self = shift;
-       my $dd = new Data::Dumper([$self]);
-       $dd->Indent(0);
-       $dd->Terse(1);
-    $dd->Quotekeys($] < 5.005 ? 1 : 0);
-       return $dd->Dumpxs;
+       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;
 }
 
 #
@@ -343,6 +360,7 @@ sub asc_decode
 {
        my $s = shift;
        my $ref;
+       $s =~ s/\%([0-9A-F][0-9A-F])/chr(hex($1))/eg;
        eval '$ref = ' . $s;
        if ($@) {
                LogDbg('err', $@);
@@ -359,10 +377,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);
 }
@@ -404,13 +418,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;
@@ -511,7 +526,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");
@@ -719,6 +734,16 @@ sub wantdxitu
        return _want('dxitu', @_);
 }
 
+sub wantgtk
+{
+       return _want('gtk', @_);
+}
+
+sub wantpc9x
+{
+       return _want('pc9x', @_);
+}
+
 sub wantlogininfo
 {
        my $self = shift;