X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXUser.pm;h=6a06bb3c32baa4278543b32c2764cc8305e264f6;hb=refs%2Fheads%2Fnewdisc;hp=840498c041d3e4d20c707e398c0b0a8028ef625a;hpb=ae313f260d904cd45b58e4d1e620a49aef1a42c9;p=spider.git diff --git a/perl/DXUser.pm b/perl/DXUser.pm index 840498c0..6a06bb3c 100644 --- a/perl/DXUser.pm +++ b/perl/DXUser.pm @@ -3,7 +3,7 @@ # # Copyright (c) 1998 - Dirk Koopman G1TLH # -# $Id$ +# # package DXUser; @@ -16,15 +16,10 @@ use IO::File; use DXDebug; use DXUtil; use LRU; +use File::Copy; 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 = (); @@ -86,6 +81,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', @@ -94,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; @@ -119,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; @@ -130,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)"); @@ -141,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) { @@ -163,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) { @@ -182,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; } @@ -195,7 +188,7 @@ sub del_file sub process { if ($main::systime > $lasttime + 15) { - $dbm->sync; + $dbm->sync if $dbm; $lasttime = $main::systime; } } @@ -242,17 +235,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); + 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; } @@ -269,14 +271,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); } # @@ -297,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); @@ -330,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; } # @@ -357,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); } @@ -401,14 +412,17 @@ sub fields sub export { - my $fn = shift; + my $name = shift || 'user_asc'; + my $basic_info_only = shift; + + my $fn = $name ne 'user_asc' ? $name : "$main::local_data/$name"; # force use of local # 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"; + move "$fn.oooo", "$fn.ooooo" if -e "$fn.oooo"; + move "$fn.ooo", "$fn.oooo" if -e "$fn.ooo"; + move "$fn.oo", "$fn.ooo" if -e "$fn.oo"; + move "$fn.o", "$fn.oo" if -e "$fn.o"; + move "$fn", "$fn.o" if -e "$fn"; my $count = 0; my $err = 0; @@ -442,7 +456,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 = ; @@ -452,9 +466,7 @@ BEGIN { } } -package DXUser; - -use DXVars; +use SysVar; use DXUser; if (@ARGV) { @@ -462,8 +474,10 @@ if (@ARGV) { print "user filename now $userfn\n"; } -DXUser->del_file($main::userfn); -DXUser->init($main::userfn, 1); +package DXUser; + +del_file(); +init(1); %u = (); my $count = 0; my $err = 0; @@ -479,7 +493,7 @@ while () { $err++ } } -DXUser->sync; DXUser->finish; +DXUser::sync; DXUser::finish; print "There are $count user records and $err errors\n"; }; print $fh "__DATA__\n"; @@ -499,7 +513,7 @@ print "There are $count user records and $err errors\n"; my $ref = decode($val); if ($ref) { my $t = $ref->{lastin} || 0; - if ($ref->{sort} eq 'U' && !$ref->{priv} && $main::systime > $t + $tooold) { + if ($ref->is_user && !$ref->{priv} && $main::systime > $t + $tooold) { unless ($ref->{lat} && $ref->{long} || $ref->{qth} || $ref->{qra}) { eval {$dbm->del($key)}; dbg(carp("Export Error2: $key\t$val\n$@")) if $@; @@ -509,7 +523,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"); @@ -519,8 +533,10 @@ print "There are $count user records and $err errors\n"; } } $fh->close; - } - return "$count Users $del Deleted $err Errors ('sh/log Export' for details)"; + } + my $s = qq{Exported users to $fn - $count Users $del Deleted $err Errors ('sh/log Export' for details)}; + LogDbg('command', $s); + return $s; } # @@ -722,6 +738,11 @@ sub wantgtk return _want('gtk', @_); } +sub wantpc9x +{ + return _want('pc9x', @_); +} + sub wantlogininfo { my $self = shift; @@ -733,7 +754,7 @@ sub wantlogininfo sub is_node { my $self = shift; - return $self->{sort} =~ /[ACRSX]/; + return $self->{sort} =~ /^[ACRSX]$/; } sub is_local_node @@ -745,7 +766,13 @@ sub is_local_node sub is_user { my $self = shift; - return $self->{sort} eq 'U'; + return $self->{sort} =~ /^[UW]$/; +} + +sub is_web +{ + my $self = shift; + return $self->{sort} eq 'W'; } sub is_bbs