X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXUser.pm;h=8890fae9185b4d990bf9f0d6737304d22b6088a6;hb=2733a992ac8c3d315c110a2cc1984ea0a5e5d0ff;hp=454432d190ca368523e4f8b37ae69790c1220a18;hpb=86d0e8cc034db0b0d23afc09b6f596c38a57885d;p=spider.git

diff --git a/perl/DXUser.pm b/perl/DXUser.pm
index 454432d1..8890fae9 100644
--- 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 DXJSON;
 
 use strict;
 
@@ -94,7 +95,7 @@ my $json;
 		  wantcw => '0,Want RBN CW,yesno',
 		  wantrtty => '0,Want RBN RTTY,yesno',
 		  wantpsk => '0,Want RBN PSK,yesno',
-		  wantbeacon => '0,Want (RBN) Beacon,yesno',
+		  wantbeacon => '0,Want RBN Beacon,yesno',
 		  lastoper => '9,Last for/oper,cldatetime',
 		  nothere => '0,Not Here Text',
 		  registered => '9,Registered?,yesno',
@@ -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;
@@ -133,7 +135,7 @@ sub init
 {
 	my $mode = shift;
   
-   $json = JSON->new->canonical(1);
+   $json = DXJSON->new->canonical(1);
 	my $fn = "users";
 	$filename = localdata("$fn.v3j");
 	unless (-e $filename || $mode == 2) {
@@ -307,25 +309,13 @@ sub put
 # thaw the user
 sub decode
 {
-    my $s = shift;
-    my $ref;
-    eval { $ref = $json->decode($s) };
-    if ($ref && !$@) {
-        return bless $ref, 'DXUser';
-    } else {
-        LogDbg('DXUser', "DXUser::json_decode: on '$s' $@");
-    }
-    return undef;
+	return $json->decode(shift, __PACKAGE__);
 }
 
 # freeze the user
 sub encode
 {
-    my $ref = shift;
-    unbless($ref);
-    my $s = $json->encode($ref);
-    bless $ref, 'DXUser';
-    return $s;
+	return $json->encode(shift);
 }
 
 
@@ -481,10 +471,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 +485,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 +495,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 +660,7 @@ sub wanttalk
 
 sub wantgrid
 {
-	return _want('grid', @_);
+	return _wantnot('grid', @_);
 }
 
 sub wantemail
@@ -705,12 +695,12 @@ sub wantusstate
 
 sub wantdxcq
 {
-	return _want('dxcq', @_);
+	return _wantnot('dxcq', @_);
 }
 
 sub wantdxitu
 {
-	return _want('dxitu', @_);
+	return _wantnot('dxitu', @_);
 }
 
 sub wantgtk