clean up various things and add the DXXml.pm module

[spider.git] / perl / DXUser.pm

diff --git a/perl/DXUser.pm b/perl/DXUser.pm
index adddce0a4cef1f5701536e8d361530cc303f6244..13c5ba8101f55a66213d17be199e69901800710d 100644 (file)
--- a/perl/DXUser.pm
+++ b/perl/DXUser.pm
@@ -78,8 +78,6 @@ $v3 = 0;
                  wantlogininfo => '0,Login Info Req,yesno',
           wantgrid => '0,Show DX Grid,yesno',
                  wantann_talk => '0,Talklike Anns,yesno',
-                 wantpc90 => '1,Req PC90,yesno',
-                 wantnp => '1,Req New Proto,yesno',
                  wantpc16 => '9,Want Users from node,yesno',
                  wantsendpc16 => '9,Send PC16,yesno',
                  wantroutepc19 => '9,Route PC19,yesno',
@@ -344,8 +342,7 @@ sub asc_decode
        my $ref;
        eval '$ref = ' . $s;
        if ($@) {
-               dbg($@);
-               Log('err', $@);
+               LogDbg('err', $@);
                $ref = undef;
        }
        return $ref;
@@ -492,7 +489,7 @@ print "There are $count user records and $err errors\n";
                                my $ekey = $key;
                                $eval =~ s/([\%\x00-\x1f\x7f-\xff])/sprintf("%%%02X", ord($1))/eg; 
                                $ekey =~ s/([\%\x00-\x1f\x7f-\xff])/sprintf("%%%02X", ord($1))/eg; 
-                               Log('DXCommand', "Export Error1: $ekey\t$eval");
+                               LogDbg('DXCommand', "Export Error1: $ekey\t$eval");
                                eval {$dbm->del($key)};
                                dbg(carp("Export Error1: $ekey\t$eval\n$@")) if $@;
                                ++$err;
@@ -505,7 +502,7 @@ print "There are $count user records and $err errors\n";
                                        unless ($ref->{lat} && $ref->{long} || $ref->{qth} || $ref->{qra}) {
                                                eval {$dbm->del($key)};
                                                dbg(carp("Export Error2: $key\t$val\n$@")) if $@;
-                                               Log('DXCommand', "$ref->{call} deleted, too old");
+                                               LogDbg('DXCommand', "$ref->{call} deleted, too old");
                                                $del++;
                                                next;
                                        }
@@ -514,7 +511,7 @@ print "There are $count user records and $err errors\n";
                                print $fh "$key\t" . $ref->asc_encode . "\n";
                                ++$count;
                        } else {
-                               Log('DXCommand', "Export Error3: $key\t$val");
+                               LogDbg('DXCommand', "Export Error3: $key\t$val");
                                eval {$dbm->del($key)};
                                dbg(carp("Export Error3: $key\t$val\n$@")) if $@;
                                ++$err;
@@ -687,11 +684,6 @@ sub wantpc16
        return _want('pc16', @_);
 }
 
-sub wantpc90
-{
-       return _wantnot('pc90', @_);
-}
-
 sub wantsendpc16
 {
        return _want('sendpc16', @_);
@@ -717,11 +709,6 @@ sub wantdxitu
        return _want('dxitu', @_);
 }
 
-sub wantnp
-{
-       return _wantnot('np', @_);
-}
-
 sub wantlogininfo
 {
        my $self = shift;