improve dbg tagging and dbgdump, Add call to conns

[spider.git] / perl / DXUser.pm

diff --git a/perl/DXUser.pm b/perl/DXUser.pm
index 454432d190ca368523e4f8b37ae69790c1220a18..642649e844e45567d07557f7a9f8630dbaf43d45 100644 (file)
--- a/perl/DXUser.pm
+++ b/perl/DXUser.pm
@@ -20,6 +20,7 @@ use File::Copy;
 use Data::Structure::Util qw(unbless);
 use Time::HiRes qw(gettimeofday tv_interval);
 use IO::File;
+use JSON;
 
 use strict;
 
@@ -106,6 +107,7 @@ my $json;
                  maxconnect => '1,Max Connections',
                  startt => '0,Start Time,cldatetime',
                  connlist => '1,Connections,parraydifft',
+                 width => '0,Preferred Width'
                 );
 
 #no strict;
@@ -323,9 +325,15 @@ sub encode
 {
     my $ref = shift;
     unbless($ref);
-    my $s = $json->encode($ref);
-    bless $ref, 'DXUser';
-    return $s;
+    my $s;
+       
+       eval {$s = $json->encode($ref) };
+       if ($s && !$@) {
+               bless $ref, 'DXUser';
+               return $s;
+       } else {
+               LogDbg('DXUser', "DXUser::json_encode $ref->{call}, $@");
+       }
 }
 
 
@@ -481,10 +489,10 @@ print "There are $count user records and $err errors in $diff mS\n";
                                my $eval = $val;
                                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; 
-                               LogDbg('DXCommand', "Export Error1: $ekey\t$eval");
+                               $ekey =~ s/([\%\x00-\x1f\x7f-\xff])/sprintf("%%%02X", ord($1))/eg;
+                               LogDbg('DXCommand', "Export Error1: invalid call '$key' => '$val'");
                                eval {$dbm->del($key)};
-                               dbg(carp("Export Error1: $ekey\t$eval\n$@")) if $@;
+                           dbg(carp("Export Error1: delete $key => '$val' $@")) if $@;
                                ++$err;
                                next;
                        }
@@ -495,7 +503,7 @@ print "There are $count user records and $err errors in $diff mS\n";
                                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 $@;
+                                               dbg(carp("Export Error2: delete '$key' => '$val' $@")) if $@;
                                                LogDbg('DXCommand', "$ref->{call} deleted, too old");
                                                $del++;
                                                next;
@@ -505,9 +513,9 @@ print "There are $count user records and $err errors in $diff mS\n";
                                print $fh "$key\t" . encode($ref) . "\n";
                                ++$count;
                        } else {
-                               LogDbg('DXCommand', "Export Error3: $key\t" . carp($val) ."\n$@");
+                               LogDbg('DXCommand', "Export Error3: '$key'\t" . carp($val) ."\n$@");
                                eval {$dbm->del($key)};
-                               dbg(carp("Export Error3: $key\t$val\n$@")) if $@;
+                               dbg(carp("Export Error3: delete '$key' => '$val' $@")) if $@;
                                ++$err;
                        }
                } 
@@ -670,7 +678,7 @@ sub wanttalk
 
 sub wantgrid
 {
-       return _want('grid', @_);
+       return _wantnot('grid', @_);
 }
 
 sub wantemail
@@ -705,12 +713,12 @@ sub wantusstate
 
 sub wantdxcq
 {
-       return _want('dxcq', @_);
+       return _wantnot('dxcq', @_);
 }
 
 sub wantdxitu
 {
-       return _want('dxitu', @_);
+       return _wantnot('dxitu', @_);
 }
 
 sub wantgtk