X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=perl%2FDXUser.pm;h=26eb3d424000528561df17944f0c13b04e9acaf1;hb=a645d1b0058cd4a02d88d5657ed915fc6e88b1a7;hp=dd31e6f632fffac6003e11bf3b700c8275cfb28b;hpb=c94ff1bf2cbe16ed59c5b273c7f6730fd7314cab;p=spider.git

diff --git a/perl/DXUser.pm b/perl/DXUser.pm
index dd31e6f6..26eb3d42 100644
--- a/perl/DXUser.pm
+++ b/perl/DXUser.pm
@@ -177,9 +177,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";
 }
 
 #
@@ -412,15 +412,17 @@ sub fields
 
 sub export
 {
-	my $fn = shift;
+	my $name = shift || 'user_asc';
 	my $basic_info_only = shift;
+
+	my $fn = $name ne 'user_asc' ? $name : "$main::local_data/$name";                       # force use of local
 	
 	# save old ones
-	rename "$fn.oooo", "$fn.ooooo" if -e "$fn.oooo";
-	rename "$fn.ooo", "$fn.oooo" if -e "$fn.ooo";
-	rename "$fn.oo", "$fn.ooo" if -e "$fn.oo";
-	rename "$fn.o", "$fn.oo" if -e "$fn.o";
-	rename "$fn", "$fn.o" if -e "$fn";
+	move "$fn.oooo", "$fn.ooooo" if -e "$fn.oooo";
+	move "$fn.ooo", "$fn.oooo" if -e "$fn.ooo";
+	move "$fn.oo", "$fn.ooo" if -e "$fn.oo";
+	move "$fn.o", "$fn.oo" if -e "$fn.o";
+	move "$fn", "$fn.o" if -e "$fn";
 
 	my $count = 0;
 	my $err = 0;
@@ -464,8 +466,6 @@ BEGIN {
 	}
 }
 
-package DXUser;
-
 use SysVar;
 use DXUser;
 
@@ -474,8 +474,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;
@@ -486,12 +488,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";
@@ -511,7 +514,7 @@ print "There are $count user records and $err errors\n";
 			my $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 $@;
@@ -531,8 +534,10 @@ print "There are $count user records and $err errors\n";
 			}
 		} 
         $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;
 }
 
 #
@@ -750,7 +755,7 @@ sub wantlogininfo
 sub is_node
 {
 	my $self = shift;
-	return $self->{sort} =~ /[ACRSX]/;
+	return $self->{sort} =~ /^[ACRSX]$/;
 }
 
 sub is_local_node
@@ -762,7 +767,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