Change DXUser->get* to DXUser::get*

[spider.git] / perl / DXUser.pm

diff --git a/perl/DXUser.pm b/perl/DXUser.pm
index 13c5ba8101f55a66213d17be199e69901800710d..e2c24f598a5eee6d7fdd941ade20ac7f46cb0c78 100644 (file)
--- a/perl/DXUser.pm
+++ b/perl/DXUser.pm
@@ -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 = ();
@@ -61,7 +55,8 @@ $v3 = 0;
                  annok => '9,Accept Announces?,yesno', # accept his announces?
                  lang => '0,Language',
                  hmsgno => '0,Highest Msgno',
-                 group => '0,Chat Group,parray',       # used to create a group of users/nodes for some purpose or other
+                 group => '0,Group,parray',    # used to create a group of users/nodes for some purpose or other
+                 buddies => '0,Buddies,parray',
                  isolate => '9,Isolate network,yesno',
                  wantbeep => '0,Req Beep,yesno',
                  wantann => '0,Req Announce,yesno',
@@ -84,6 +79,8 @@ $v3 = 0;
                  wantusstate => '0,Show US State,yesno',
                  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',
@@ -141,7 +138,7 @@ sub init
 
                $ufn = "$fn.v3";
                $v3 = 1;
-               $convert++ unless -e $ufn;
+               $convert++ if -e "$fn.v2" && !-e $ufn;
        }
        
        if ($mode) {
@@ -150,10 +147,12 @@ sub init
                $dbm = tie (%u, 'DB_File', $ufn, O_RDONLY, 0666, $DB_BTREE) or confess "can't open user file: $fn ($!) [rebuild it from user_asc?]";
        }
 
+       die "Cannot open $ufn ($!)\n" unless $dbm;
+
        $lru = LRU->newbase("DXUser", $lrusize);
        
        # do a conversion if required
-       if ($convert) {
+       if ($dbm && $convert) {
                my ($key, $val, $action, $count, $err) = ('','',0,0,0);
                
                my %oldu;
@@ -238,7 +237,6 @@ sub new
 
 sub get
 {
-       my $pkg = shift;
        my $call = uc shift;
        my $data;
        
@@ -249,6 +247,11 @@ sub get
        # 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");
+                       return undef;
+               }
                $lru->put($call, $ref);
                return $ref;
        }
@@ -265,14 +268,11 @@ 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);
+       return get($call);
 }
 
 #
@@ -326,11 +326,7 @@ 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;
+       return dd($self);
 }
 
 #
@@ -340,6 +336,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', $@);
@@ -583,6 +580,13 @@ sub new_group
        $self->{group} = [ 'local' ];
 }
 
+# set up empty buddies (only happens for them's that connect direct)
+sub new_buddies
+{
+       my $self = shift;
+       $self->{buddies} = [  ];
+}
+
 #
 # return a prompt for a field
 #
@@ -709,6 +713,16 @@ sub wantdxitu
        return _want('dxitu', @_);
 }
 
+sub wantgtk
+{
+       return _want('gtk', @_);
+}
+
+sub wantpc9x
+{
+       return _want('pc9x', @_);
+}
+
 sub wantlogininfo
 {
        my $self = shift;
@@ -723,6 +737,12 @@ sub is_node
        return $self->{sort} =~ /[ACRSX]/;
 }
 
+sub is_local_node
+{
+       my $self = shift;
+       return grep $_ eq 'local_node', @{$self->{group}};
+}
+
 sub is_user
 {
        my $self = shift;