X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXUser.pm;h=49745722ffd29ae51badd4e665a9f192853a8d00;hb=91cb091ed723c5650202345ae9c4f0277e36f0a8;hp=fc2dab5c7a64106a7a30e1262fbcb7466b2b58bc;hpb=89ab02190d47c949e48b303260055f00591e3cdd;p=spider.git diff --git a/perl/DXUser.pm b/perl/DXUser.pm index fc2dab5c..49745722 100644 --- a/perl/DXUser.pm +++ b/perl/DXUser.pm @@ -13,15 +13,19 @@ require Exporter; use DXLog; use DB_File; +use Data::Dumper; use Fcntl; -use Carp; +use IO::File; +use DXDebug; use strict; -use vars qw(%u $dbm $filename %valid); +use vars qw(%u $dbm $filename %valid $lastoperinterval $lasttime); %u = (); $dbm = undef; $filename = undef; +$lastoperinterval = 30*24*60*60; +$lasttime = 0; # hash of valid elements and a simple prompt %valid = ( @@ -43,8 +47,8 @@ $filename = undef; node => '0,Last Node', homenode => '0,Home Node', lockout => '9,Locked out?,yesno', # won't let them in at all - dxok => '9,DX Spots?,yesno', # accept his dx spots? - annok => '9,Announces?,yesno', # accept his announces? + dxok => '9,Accept DX Spots?,yesno', # accept his dx spots? + annok => '9,Accept Announces?,yesno', # accept his announces? reg => '0,Registered?,yesno', # is this user registered? lang => '0,Language', hmsgno => '0,Highest Msgno', @@ -53,9 +57,17 @@ $filename = undef; wantbeep => '0,Rec Beep,yesno', wantann => '0,Rec Announce,yesno', wantwwv => '0,Rec WWV,yesno', + wantwcy => '0,Rec WCY,yesno', + wantecho => '0,Rec Echo,yesno', wanttalk => '0,Rec Talk,yesno', wantwx => '0,Rec WX,yesno', wantdx => '0,Rec DX Spots,yesno', + pagelth => '0,Current Pagelth', + pingint => '9,Node Ping interval', + nopings => '9,Ping Obs Count', + wantlogininfo => '9,Login info req,yesno', + wantgrid => '0,DX Grid Info,yesno', + lastoper => '9,Last for/oper,cldatetime', ); no strict; @@ -94,6 +106,17 @@ sub init use strict; +# +# periodic processing +# +sub process +{ + if ($main::systime > $lasttime + 15) { + $dbm->sync; + $lasttime = $main::systime; + } +} + # # close the system # @@ -119,10 +142,7 @@ sub new my $self = bless {}, $pkg; $self->{call} = $call; $self->{'sort'} = 'U'; - $self->{dxok} = 1; - $self->{annok} = 1; - $self->{lang} = $main::lang; - $u{call} = $self->encode(); + $self->put; return $self; } @@ -135,18 +155,11 @@ sub get { my $pkg = shift; my $call = uc shift; - # $call =~ s/-\d+$//o; # strip ssid - my $s = $u{$call}; - return $s ? decode($s) : undef; -} - -# -# get all callsigns in the database -# - -sub get_all_calls -{ - return (sort keys %u); + my $data; + unless ($dbm->get($call, $data)) { + return decode($data); + } + return undef; } # @@ -161,12 +174,23 @@ sub get_current { my $pkg = shift; my $call = uc shift; - # $call =~ s/-\d+$//o; # strip ssid my $dxchan = DXChannel->get($call); return $dxchan->user if $dxchan; - my $s = $u{$call}; - return $s ? decode($s) : undef; + my $data; + unless ($dbm->get($call, $data)) { + return decode($data); + } + return undef; +} + +# +# get all callsigns in the database +# + +sub get_all_calls +{ + return (sort keys %u); } # @@ -176,8 +200,15 @@ sub get_current sub put { my $self = shift; + confess "Trying to put nothing!" unless $self && ref $self; my $call = $self->{call}; - $u{$call} = $self->encode(); + # delete all instances of this + for ($dbm->get_dup($call)) { + $dbm->del_dup($call, $_); + } + delete $self->{annok} if $self->{annok}; + delete $self->{dxok} if $self->{dxok}; + $dbm->put($call, $self->encode); } # @@ -186,27 +217,11 @@ sub put sub encode { my $self = shift; - my $out; - my $f; - - $out = "bless( { "; - for $f (sort keys %$self) { - my $val = $$self{$f}; - if (ref $val) { # it's an array (we think) - $out .= "'$f'=>[ "; - foreach (@$val) { - my $s = $_; - $out .= "'$s',"; - } - $out .= " ],"; - } else { - $val =~ s/'/\\'/og; - $val =~ s/\@/\\@/og; - $out .= "'$f'=>q{$val},"; - } - } - $out .= " }, 'DXUser')"; - return $out; + my $dd = new Data::Dumper([$self]); + $dd->Indent(0); + $dd->Terse(1); + $dd->Quotekeys($] < 5.005 ? 1 : 0); + return $dd->Dumpxs; } # @@ -216,10 +231,12 @@ sub decode { my $s = shift; my $ref; - $s = '$ref = ' . $s; - eval $s; - Log('DXUser', $@) if $@; - $ref = undef if $@; + eval '$ref = ' . $s; + if ($@) { + dbg('err', $@) if $@; + Log('err', $@) if $@; + $ref = undef; + } return $ref; } @@ -231,7 +248,10 @@ sub del { my $self = shift; my $call = $self->{call}; - delete $u{$call}; + # delete all instances of this + for ($dbm->get_dup($call)) { + $dbm->del_dup($call, $_); + } } # @@ -245,6 +265,15 @@ sub close $self->put(); } +# +# sync the database +# + +sub sync +{ + $dbm->sync; +} + # # return a list of valid elements # @@ -254,6 +283,52 @@ sub fields return keys(%valid); } + +# +# export the database to an ascii file +# + +sub export +{ + my $fn = 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"; + + my $count = 0; + my $fh = new IO::File ">$fn" or return "cannot open $fn ($!)"; + if ($fh) { + my $ref; + my $key; + my $action; + my $t = scalar localtime; + print $fh "#!/usr/bin/perl +# +# The exported userfile for a DXSpider System +# +# Input file: $filename +# Time: $t +# + +package DXUser; + +%u = ( +"; + + for ($action = R_FIRST; !$dbm->seq($key, $ref, $action); $action = R_NEXT) { + print $fh "'$key' => $ref,\n"; + ++$count; + } + print $fh ");\n#\n# there were $count records\n#\n"; + $fh->close; + } + return $count; +} + # # group handling # @@ -337,9 +412,10 @@ sub _want { my $n = shift; my $self = shift; + my $val = shift; my $s = "want$n"; - return $self->{$n} = shift if @_; - return defined $self->{$n} ? $self->{$n} : 1; + $self->{$s} = $val if defined $val; + return exists $self->{$s} ? $self->{$s} : 1; } sub wantbeep @@ -357,6 +433,16 @@ sub wantwwv return _want('wwv', @_); } +sub wantwcy +{ + return _want('wcy', @_); +} + +sub wantecho +{ + return _want('echo', @_); +} + sub wantwx { return _want('wx', @_); @@ -367,5 +453,75 @@ sub wantdx return _want('dx', @_); } +sub wanttalk +{ + return _want('talk', @_); +} + +sub wantgrid +{ + return _want('grid', @_); +} + +sub wantlogininfo +{ + my $self = shift; + my $n = shift; + $self->{wantlogininfo} = $n if $n; + return exists $self->{wantlogininfo} ? $self->{wantlogininfo} : 0; +} + +sub is_node +{ + my $self = shift; + return $self->{sort} =~ /[ACRSX]/; +} + +sub is_user +{ + my $self = shift; + return $self->{sort} eq 'U'; +} + +sub is_bbs +{ + my $self = shift; + return $self->{sort} eq 'B'; +} + +sub is_spider +{ + my $self = shift; + return $self->{sort} eq 'S'; +} + +sub is_clx +{ + my $self = shift; + return $self->{sort} eq 'C'; +} + +sub is_dxnet +{ + my $self = shift; + return $self->{sort} eq 'X'; +} + +sub is_arcluster +{ + my $self = shift; + return $self->{sort} eq 'R'; +} + +sub is_ak1a +{ + my $self = shift; + return $self->{sort} eq 'A'; +} 1; __END__ + + + + +