X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXUser.pm;h=d385382b80fe13469bc9e8f85360ed26a54b39e0;hb=5d8dbe7521fca34aa28ce372228b077bda5ab87f;hp=60fc1afda1d69c2572710e9252445e4149f75d5f;hpb=4f1c00b0c181d994b13bb9b0ff9ea03ee0cf120c;p=spider.git

diff --git a/perl/DXUser.pm b/perl/DXUser.pm
index 60fc1afd..d385382b 100644
--- a/perl/DXUser.pm
+++ b/perl/DXUser.pm
@@ -160,12 +160,17 @@ sub init
 		dbg("This will take a while, I suggest you go and have cup of strong tea");
 		my $odbm = tie (%oldu, 'DB_File', localdata("users.v2"), O_RDONLY, 0666, $DB_BTREE) or confess "can't open user file: $fn.v2 ($!) [rebuild it from user_asc?]";
         for ($action = R_FIRST; !$odbm->seq($key, $val, $action); $action = R_NEXT) {
-			my $ref = asc_decode($val);
-			if ($ref) {
-				$ref->put;
-				$count++;
+			my $ref;
+			eval { $ref = asc_decode($val) };
+			unless ($@) {
+				if ($ref) {
+					$ref->put;
+					$count++;
+				} else {
+					$err++
+				}
 			} else {
-				$err++
+				Log('err', "DXUser: error decoding $@");
 			}
 		} 
 		undef $odbm;
@@ -177,9 +182,9 @@ sub init
 
 sub del_file
 {
-	my $fn = localdata("users");
-	$fn .= $v3 ? ".v3" : ".v2";
-	unlink $fn;
+	# with extreme prejudice
+	unlink "$main::data/users.v3";
+	unlink "$main::local_data/users.v3";
 }
 
 #
@@ -244,7 +249,8 @@ sub get
 	
 	# search for it
 	unless ($dbm->get($call, $data)) {
-		$ref = decode($data);
+		eval { $ref = decode($data); };
+		
 		if ($ref) {
 			if (!UNIVERSAL::isa($ref, 'DXUser')) {
 				dbg("DXUser::get: got strange answer from decode of $call". ref $ref. " ignoring");
@@ -252,7 +258,11 @@ sub get
 			}
 			# we have a reference and it *is* a DXUser
 		} else {
-			dbg("DXUser::get: no reference returned from decode of $call $!");
+			if ($@) {
+				LogDbg('err', "DXUser::get decode error on $call '$@'");
+			} else {
+				dbg("DXUser::get: no reference returned from decode of $call $!");
+			}
 			return undef;
 		}
 		$lru->put($call, $ref);
@@ -323,7 +333,9 @@ sub encode
 sub decode
 {
 	goto &asc_decode unless $v3;
-	return thaw(shift);
+	my $ref;
+	$ref = thaw(shift);
+	return $ref;
 }
 
 # 
@@ -358,7 +370,7 @@ sub asc_decode
 	$s =~ s/\%([0-9A-F][0-9A-F])/chr(hex($1))/eg;
 	eval '$ref = ' . $s;
 	if ($@) {
-		LogDbg('err', $@);
+		LogDbg('err', "DXUser::asc_decode: on '$s' $@");
 		$ref = undef;
 	}
 	return $ref;
@@ -412,10 +424,10 @@ sub fields
 
 sub export
 {
-	my $name = shift;
+	my $name = shift || 'user_asc';
 	my $basic_info_only = shift;
 
-	my $fn = "$main::local_data/$name";
+	my $fn = $name ne 'user_asc' ? $name : "$main::local_data/$name";                       # force use of local
 	
 	# save old ones
 	move "$fn.oooo", "$fn.ooooo" if -e "$fn.oooo";
@@ -466,8 +478,6 @@ BEGIN {
 	}
 }
 
-package DXUser;
-
 use SysVar;
 use DXUser;
 
@@ -476,8 +486,10 @@ if (@ARGV) {
 	print "user filename now $userfn\n";
 }
 
-DXUser::del_file();
-DXUser::init();
+package DXUser;
+
+del_file();
+init(1);
 %u = ();
 my $count = 0;
 my $err = 0;
@@ -488,12 +500,13 @@ while (<DATA>) {
 	if ($ref) {
 		$ref->put();
 		$count++;
+        DXUser::sync() unless $count % 10000;
 	} else {
 		print "# Error: $f[0]\t$f[1]\n";
 		$err++
 	}
 }
-DXUser::sync; DXUser::finish;
+DXUser::sync(); DXUser::finish();
 print "There are $count user records and $err errors\n";
 };
 		print $fh "__DATA__\n";
@@ -510,10 +523,11 @@ print "There are $count user records and $err errors\n";
 				++$err;
 				next;
 			}
-			my $ref = decode($val);
+			my $ref;
+			eval {$ref = decode($val); };
 			if ($ref) {
 				my $t = $ref->{lastin} || 0;
-				if ($ref->{sort} eq 'U' && !$ref->{priv} && $main::systime > $t + $tooold) {
+				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 $@;
@@ -526,15 +540,17 @@ print "There are $count user records and $err errors\n";
 				print $fh "$key\t" . $ref->asc_encode($basic_info_only) . "\n";
 				++$count;
 			} else {
-				LogDbg('DXCommand', "Export Error3: $key\t$val");
+				LogDbg('DXCommand', "Export Error3: $key\t" . carp($val) ."\n$@");
 				eval {$dbm->del($key)};
 				dbg(carp("Export Error3: $key\t$val\n$@")) if $@;
 				++$err;
 			}
 		} 
         $fh->close;
-    } 
-	return "$count Users $del Deleted $err Errors ('sh/log Export' for details)";
+    }
+	my $s = qq{Exported users to $fn - $count Users $del Deleted $err Errors ('sh/log Export' for details)};
+	LogDbg('command', $s);
+	return $s;
 }
 
 #
@@ -752,7 +768,7 @@ sub wantlogininfo
 sub is_node
 {
 	my $self = shift;
-	return $self->{sort} =~ /[ACRSX]/;
+	return $self->{sort} =~ /^[ACRSX]$/;
 }
 
 sub is_local_node
@@ -764,7 +780,13 @@ sub is_local_node
 sub is_user
 {
 	my $self = shift;
-	return $self->{sort} eq 'U';
+	return $self->{sort} =~ /^[UW]$/;
+}
+
+sub is_web
+{
+	my $self = shift;
+	return $self->{sort} eq 'W';
 }
 
 sub is_bbs