X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXUser.pm;h=4af135e7e795aefe0a7a39bc2f8a189828d442df;hb=a24cc09d8262093df92c767d3010c0a5fd6e42d7;hp=1249b0b69f8842f323d13ff245a68774fcc7e452;hpb=dd73f6f34ce7f3e142e480dfb7153611d87f509b;p=spider.git

diff --git a/perl/DXUser.pm b/perl/DXUser.pm
index 1249b0b6..4af135e7 100644
--- a/perl/DXUser.pm
+++ b/perl/DXUser.pm
@@ -20,7 +20,7 @@ use File::Copy;
 use Data::Structure::Util qw(unbless);
 use Time::HiRes qw(gettimeofday tv_interval);
 use IO::File;
-use JSON;
+use DXJSON;
 
 use strict;
 
@@ -31,7 +31,7 @@ $dbm = undef;
 $filename = undef;
 $lastoperinterval = 60*24*60*60;
 $lasttime = 0;
-$lrusize = 10000;
+$lrusize = 5000;
 $tooold = 86400 * 365;		# this marks an old user who hasn't given enough info to be useful
 $v3 = 0;
 our $maxconnlist = 3;			# remember this many connection time (duration) [start, end] pairs
@@ -95,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',
@@ -107,7 +107,8 @@ my $json;
 		  maxconnect => '1,Max Connections',
 		  startt => '0,Start Time,cldatetime',
 		  connlist => '1,Connections,parraydifft',
-		  width => '0,Preferred Width'
+		  width => '0,Preferred Width',
+		  rbnseeme => '0,RBN See Me',
 		 );
 
 #no strict;
@@ -135,17 +136,19 @@ 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) {
-		LogDbg('DXUser', "New User File version $filename does not exist, running conversion from users.v3 or v2, please wait");
-		system('/spider/perl/convert-users-v3-to-v3j.pl');
-		init(1);
-		export();
-		return;
+	unless (-e $filename || $mode == 2 ) {
+		if (-e localdata("$fn.v3") || -e localdata("$fn.v2")) {
+			LogDbg('DXUser', "New User File version $filename does not exist, running conversion from users.v3 or v2, please wait");
+			system('/spider/perl/convert-users-v3-to-v3j.pl');
+			init(1);
+			export();
+			return;
+		}
 	}
-	if (-e $filename || $mode == 2) {
+	if (-e $filename || $mode) {
 		$lru = LRU->newbase("DXUser", $lrusize);
 		if ($mode) {
 			$dbm = tie (%u, 'DB_File', $filename, O_CREAT|O_RDWR, 0666, $DB_BTREE) or confess "can't open user file: $fn ($!) [rebuild it from user_json?]";
@@ -309,31 +312,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;
-	
-	eval {$s = $json->encode($ref) };
-	if ($s && !$@) {
-		bless $ref, 'DXUser';
-		return $s;
-	} else {
-		LogDbg('DXUser', "DXUser::json_encode $ref->{call}, $@");
-	}
+	return $json->encode(shift);
 }
 
 
@@ -678,7 +663,7 @@ sub wanttalk
 
 sub wantgrid
 {
-	return _want('grid', @_);
+	return _wantnot('grid', @_);
 }
 
 sub wantemail
@@ -713,12 +698,12 @@ sub wantusstate
 
 sub wantdxcq
 {
-	return _want('dxcq', @_);
+	return _wantnot('dxcq', @_);
 }
 
 sub wantdxitu
 {
-	return _want('dxitu', @_);
+	return _wantnot('dxitu', @_);
 }
 
 sub wantgtk
@@ -851,6 +836,16 @@ sub lastping
 	$b->{$call} = shift if @_;
 	return $b->{$call};	
 }
+
+sub registered
+{
+	my $self = shift;
+	if (exists $self->{registered}) {
+		return $self->{registered} || 0;
+	}
+	return '';					# to stop undef warnings
+}
+
 1;
 __END__