X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=perl%2FDXCommandmode.pm;h=1750fee157acd6e87d497ec539642a6b08530893;hb=8032b90ab5f686159bc725b43d28862c42ad55d5;hp=f9d9c9f08b53f8b4c458f572457d7f59ed6a06c4;hpb=353dac9d2485b5e3ad0a93246a1ac550d93d05a4;p=spider.git

diff --git a/perl/DXCommandmode.pm b/perl/DXCommandmode.pm
index f9d9c9f0..1750fee1 100644
--- a/perl/DXCommandmode.pm
+++ b/perl/DXCommandmode.pm
@@ -109,6 +109,11 @@ sub start
 	$self->{here} = 1;
 	$self->{prompt} = $user->prompt if $user->prompt;
 
+	# sort out new dx spot stuff
+	$user->wantdxcq(0) unless defined $user->{wantdxcq};
+	$user->wantdxitu(0) unless defined $user->{wantdxitu};	
+	$user->wantusstate(0) unless defined $user->{wantusstate};
+
 	# sort out registration
 	if ($main::reqreg == 1) {
 		$self->{registered} = $user->registered;
@@ -813,6 +818,8 @@ sub dx_spot
 	}
 
 
+	dbg('spot: "' . join('","', @_) . '"') if isdbg('dxspot');
+	
 	my $t = ztime($_[2]);
 	my $loc;
 	my $clth = $self->{consort} eq 'local' ? 29 : 30;
@@ -825,16 +832,15 @@ sub dx_spot
 	} 
 	$loc = "" unless $loc;
 
-	# USDB stuff
-	if ($USDB::present && $self->{user}->wantusstate) {
-		my ($city, $state) = USDB::get($_[4]);
-		if ($state) {
-			$loc = ' ' . $state;
-		}
-		($city, $state) = USDB::get($_[1]);
-		if ($state) {
-			$comment = substr($comment, 0,  $self->{consort} eq 'local' ? 26 : 27) . ' ' . $state; 
-		}
+	if ($self->{user}->wantdxitu) {
+		$loc = ' ' . sprintf("%2d", $_[10]) if defined $_[10];
+		$comment = substr($comment, 0,  $self->{consort} eq 'local' ? 26 : 27) . ' ' . sprintf("%2d", $_[8]) if defined $_[8]; 
+	} elsif ($self->{user}->wantdxcq) {
+		$loc = ' ' . sprintf("%2d", $_[11]) if defined $_[11];
+		$comment = substr($comment, 0,  $self->{consort} eq 'local' ? 26 : 27) . ' ' . sprintf("%2d", $_[9]) if defined $_[9]; 
+	} elsif ($self->{user}->wantusstate) {
+		$loc = ' ' . $_[13] if $_[13];
+		$comment = substr($comment, 0,  $self->{consort} eq 'local' ? 26 : 27) . ' ' . $_[12] if $_[12]; 
 	}
 
 	my $buf = sprintf "DX de %-7.7s%11.1f  %-12.12s %-s $t$loc", "$_[4]:", $_[0], $_[1], $comment;