X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXUser.pm;h=3bc4218ce289363e458be4f28fb6e1c14a472a56;hb=229eee2688f9e4a1f5489b7bfafd7c32bfc12548;hp=c4e3996b35b5e90a0ebde9688de582e6a86b3839;hpb=3065f0dd2c80cd59b7a2b17d397a343b6521b1f4;p=spider.git

diff --git a/perl/DXUser.pm b/perl/DXUser.pm
index c4e3996b..3bc4218c 100644
--- a/perl/DXUser.pm
+++ b/perl/DXUser.pm
@@ -237,17 +237,25 @@ sub new
 
 sub get
 {
-	my $pkg = shift;
 	my $call = uc shift;
 	my $data;
 	
 	# is it in the LRU cache?
 	my $ref = $lru->get($call);
-	return $ref if $ref;
+	return $ref if $ref && ref $ref eq 'DXUser';
 	
 	# search for it
 	unless ($dbm->get($call, $data)) {
 		$ref = decode($data);
+		if ($ref) {
+			if (ref $ref ne 'DXUser') {
+				dbg("DXUser::get: got strange answer from decode ". ref $ref. " ignoring");
+				return undef;
+			}
+		} else {
+			dbg("DXUser::get: no reference returned from decode $!");
+			return undef;
+		}
 		$lru->put($call, $ref);
 		return $ref;
 	}
@@ -264,14 +272,16 @@ sub get
 
 sub get_current
 {
-	my $pkg = shift;
 	my $call = uc shift;
   
 	my $dxchan = DXChannel::get($call);
-	return $dxchan->user if $dxchan;
-	my $rref = Route::get($call);
-	return $rref->user if $rref && exists $rref->{user};
-	return $pkg->get($call);
+	if ($dxchan) {
+		my $ref = $dxchan->user;
+		return $ref if ref $ref eq 'DXUser';
+
+		dbg("DXUser::get_current: got invalid user ref from dxchan $dxchan->{call} ". ref $ref. " ignoring");
+	}
+	return get($call);
 }
 
 #
@@ -292,13 +302,11 @@ sub put
 	my $self = shift;
 	confess "Trying to put nothing!" unless $self && ref $self;
 	my $call = $self->{call};
-	# delete all instances of this 
-#	for ($dbm->get_dup($call)) {
-#		$dbm->del_dup($call, $_);
-#	}
+
 	$dbm->del($call);
 	delete $self->{annok} if $self->{annok};
 	delete $self->{dxok} if $self->{dxok};
+
 	$lru->put($call, $self);
 	my $ref = $self->encode;
 	$dbm->put($call, $ref);
@@ -325,7 +333,20 @@ sub decode
 sub asc_encode
 {
 	my $self = shift;
-	return dd($self);
+	my $strip = shift;
+	my $p;
+
+	if ($strip) {
+		my $ref = bless {}, ref $self;
+		foreach my $k (qw(qth lat long qra sort call homenode node lastoper lastin)) {
+			$ref->{$k} = $self->{$k} if exists $self->{$k};
+		}
+		$ref->{name} = $self->{name} if exists $self->{name} && $self->{name} !~ /selfspot/i;
+		$p = dd($ref);
+	} else {
+		$p = dd($self);
+	}
+	return $p;
 }
 
 #
@@ -352,10 +373,6 @@ sub del
 {
 	my $self = shift;
 	my $call = $self->{call};
-	# delete all instances of this 
-#	for ($dbm->get_dup($call)) {
-#		$dbm->del_dup($call, $_);
-#	}
 	$lru->remove($call);
 	$dbm->del($call);
 }
@@ -397,13 +414,14 @@ sub fields
 sub export
 {
 	my $fn = shift;
+	my $basic_info_only = shift;
 	
 	# 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";
+	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";
 
 	my $count = 0;
 	my $err = 0;
@@ -504,7 +522,7 @@ print "There are $count user records and $err errors\n";
 					}
 				}
 				# only store users that are reasonably active or have useful information
-				print $fh "$key\t" . $ref->asc_encode . "\n";
+				print $fh "$key\t" . $ref->asc_encode($basic_info_only) . "\n";
 				++$count;
 			} else {
 				LogDbg('DXCommand', "Export Error3: $key\t$val");