move ganerated stuff to local_data

[spider.git] / perl / DXUser.pm

diff --git a/perl/DXUser.pm b/perl/DXUser.pm
index 94fa3d1a9ff1549fe2659b69444fef2915c565a9..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;
 
@@ -115,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;
        
@@ -126,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)");
@@ -137,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) {
@@ -159,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) {
@@ -178,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;
 }
@@ -191,7 +188,7 @@ sub del_file
 sub process
 {
        if ($main::systime > $lasttime + 15) {
-               $dbm->sync;
+               $dbm->sync if $dbm;
                $lasttime = $main::systime;
        }
 }
@@ -249,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);
@@ -278,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);
 }
@@ -456,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>;
@@ -468,7 +466,7 @@ BEGIN {
 
 package DXUser;
 
-use DXVars;
+use SysVar;
 use DXUser;
 
 if (@ARGV) {
@@ -476,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;
@@ -493,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";