move ganerated stuff to local_data

[spider.git] / perl / DXUser.pm

diff --git a/perl/DXUser.pm b/perl/DXUser.pm
index 34870a953dc91311ae9b10bc216b28b2e88113a8..dd31e6f632fffac6003e11bf3b700c8275cfb28b 100644 (file)
--- a/perl/DXUser.pm
+++ b/perl/DXUser.pm
@@ -16,6 +16,7 @@ use IO::File;
 use DXDebug;
 use DXUtil;
 use LRU;
+use File::Copy;
 
 use strict;
 
@@ -89,6 +90,7 @@ $v3 = 0;
                  build => '1,Build',
                  believe => '1,Believable nodes,parray',
                  lastping => '1,Last Ping at,ptimelist',
+                 maxconnect => '1,Max Connections',
                 );
 
 #no strict;
@@ -114,10 +116,8 @@ sub AUTOLOAD
 #
 sub init
 {
-       my ($pkg, $fn, $mode) = @_;
+       my $mode = shift;
   
-       confess "need a filename in User" if !$fn;
-
        my $ufn;
        my $convert;
        
@@ -125,10 +125,10 @@ sub init
                require Storable;
        };
 
-#      eval "use Storable qw(nfreeze thaw)";
+       my $fn = "users";
        
        if ($@) {
-               $ufn = "$fn.v2";
+               $ufn = localdata("users.v2");
                $v3 = $convert = 0;
                dbg("the module Storable appears to be missing!!");
                dbg("trying to continue in compatibility mode (this may fail)");
@@ -136,9 +136,9 @@ sub init
        } else {
                import Storable qw(nfreeze thaw);
 
-               $ufn = "$fn.v3";
+               $ufn = localdata("users.v3");
                $v3 = 1;
-               $convert++ if -e "$fn.v2" && !-e $ufn;
+               $convert++ if -e localdata("users.v2") && !-e $ufn;
        }
        
        if ($mode) {
@@ -158,7 +158,7 @@ sub init
                my %oldu;
                dbg("Converting the User File to V3 ");
                dbg("This will take a while, I suggest you go and have cup of strong tea");
-               my $odbm = tie (%oldu, 'DB_File', "$fn.v2", O_RDONLY, 0666, $DB_BTREE) or confess "can't open user file: $fn.v2 ($!) [rebuild it from user_asc?]";
+               my $odbm = tie (%oldu, 'DB_File', localdata("users.v2"), O_RDONLY, 0666, $DB_BTREE) or confess "can't open user file: $fn.v2 ($!) [rebuild it from user_asc?]";
         for ($action = R_FIRST; !$odbm->seq($key, $val, $action); $action = R_NEXT) {
                        my $ref = asc_decode($val);
                        if ($ref) {
@@ -177,9 +177,7 @@ sub init
 
 sub del_file
 {
-       my ($pkg, $fn) = @_;
-  
-       confess "need a filename in User" if !$fn;
+       my $fn = localdata("users");
        $fn .= $v3 ? ".v3" : ".v2";
        unlink $fn;
 }
@@ -190,7 +188,7 @@ sub del_file
 sub process
 {
        if ($main::systime > $lasttime + 15) {
-               $dbm->sync;
+               $dbm->sync if $dbm;
                $lasttime = $main::systime;
        }
 }
@@ -248,12 +246,13 @@ sub get
        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);
@@ -277,9 +276,9 @@ sub get_current
        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);
 }
@@ -302,13 +301,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);
@@ -335,7 +332,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;
 }
 
 #
@@ -362,10 +372,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);
 }
@@ -407,13 +413,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;
@@ -447,7 +454,7 @@ BEGIN {
        
        # try to detect a lockfile (this isn't atomic but 
        # should do for now
-       $lockfn = "$root/local/cluster.lck";       # lock file name
+       $lockfn = "$root/local_data/cluster.lck";       # lock file name
        if (-e $lockfn) {
                open(CLLOCK, "$lockfn") or die "Can't open Lockfile ($lockfn) $!";
                my $pid = <CLLOCK>;
@@ -459,7 +466,7 @@ BEGIN {
 
 package DXUser;
 
-use DXVars;
+use SysVar;
 use DXUser;
 
 if (@ARGV) {
@@ -467,8 +474,8 @@ if (@ARGV) {
        print "user filename now $userfn\n";
 }
 
-DXUser->del_file($main::userfn);
-DXUser->init($main::userfn, 1);
+DXUser::del_file();
+DXUser::init();
 %u = ();
 my $count = 0;
 my $err = 0;
@@ -484,7 +491,7 @@ while (<DATA>) {
                $err++
        }
 }
-DXUser->sync; DXUser->finish;
+DXUser::sync; DXUser::finish;
 print "There are $count user records and $err errors\n";
 };
                print $fh "__DATA__\n";
@@ -514,7 +521,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");