added loginfo stuff

[spider.git] / perl / DXUser.pm

diff --git a/perl/DXUser.pm b/perl/DXUser.pm
index 554a9930cdfc35ee6174c18a9893774fdd827cd7..956957e8260f1218f8eebeacd677b76795f98ef4 100644 (file)
--- a/perl/DXUser.pm
+++ b/perl/DXUser.pm
@@ -11,7 +11,9 @@ package DXUser;
 require Exporter;
 @ISA = qw(Exporter);
 
+use DXLog;
 use DB_File;
+use Data::Dumper;
 use Fcntl;
 use Carp;
 
@@ -55,6 +57,9 @@ $filename = undef;
                  wanttalk => '0,Rec Talk,yesno',
                  wantwx => '0,Rec WX,yesno',
                  wantdx => '0,Rec DX Spots,yesno',
+                 pingint => '9,Node Ping interval',
+                 nopings => '9,Ping Obs Count',
+                 wantlogininfo => '9,Login info req,yesno',
                 );
 
 no strict;
@@ -113,7 +118,7 @@ sub new
        my $call = uc shift;
        #  $call =~ s/-\d+$//o;
   
-       confess "can't create existing call $call in User\n!" if $u{$call};
+#      confess "can't create existing call $call in User\n!" if $u{$call};
 
        my $self = bless {}, $pkg;
        $self->{call} = $call;
@@ -121,7 +126,7 @@ sub new
        $self->{dxok} = 1;
        $self->{annok} = 1;
        $self->{lang} = $main::lang;
-       $u{call} = $self->encode();
+       $self->put;
        return $self;
 }
 
@@ -175,6 +180,7 @@ 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();
 }
@@ -185,27 +191,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,7 +206,7 @@ sub decode
        my $s = shift;
        my $ref;
        $s = '$ref = ' . $s;
-       eval { $s; };
+       eval $s;
        Log('DXUser', $@) if $@;
        $ref = undef if $@;
        return $ref;
@@ -366,5 +356,15 @@ sub wantdx
        return _want('dx', @_);
 }
 
+sub wanttalk
+{
+       return _want('talk', @_);
+}
+
+sub wantlogininfo
+{
+       return _want('logininfo', @_);
+}
+
 1;
 __END__