X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXUser.pm;h=6a06bb3c32baa4278543b32c2764cc8305e264f6;hb=83445c4f6ec6c885260944a9abe648aced399c40;hp=60d49eafe72e3d7b7f613f068f75cc132f273324;hpb=426a8fc779d9d363e094fd229a8de7d4fcd25518;p=spider.git

diff --git a/perl/DXUser.pm b/perl/DXUser.pm
index 60d49eaf..6a06bb3c 100644
--- a/perl/DXUser.pm
+++ b/perl/DXUser.pm
@@ -412,10 +412,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 +466,6 @@ BEGIN {
 	}
 }
 
-package DXUser;
-
 use SysVar;
 use DXUser;
 
@@ -476,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;
@@ -533,8 +533,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;
 }
 
 #