X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXCommandmode.pm;h=1750fee157acd6e87d497ec539642a6b08530893;hb=b8a01c582b9914ebe5c44afed0016e594d76e938;hp=60c7f1086d228ccc03c68f5364fe9ee71134803d;hpb=dbf7523a9b228dbdf1d03109afde351b8b194fab;p=spider.git

diff --git a/perl/DXCommandmode.pm b/perl/DXCommandmode.pm
index 60c7f108..1750fee1 100644
--- a/perl/DXCommandmode.pm
+++ b/perl/DXCommandmode.pm
@@ -31,7 +31,7 @@ use WCY;
 use Sun;
 use Internet;
 use Script;
-
+use Net::Telnet;
 
 use strict;
 use vars qw(%Cache %cmd_cache $errstr %aliases $scriptbase $maxerrors %nothereslug $maxbadcount);
@@ -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;
@@ -470,7 +475,7 @@ sub run_cmd
 			return ();
 		}
 	}
-	return (@ans);
+	return map {s/([^\s])\s+$/$1/; $_} @ans;
 }
 
 #
@@ -813,12 +818,33 @@ sub dx_spot
 	}
 
 
+	dbg('spot: "' . join('","', @_) . '"') if isdbg('dxspot');
+	
 	my $t = ztime($_[2]);
+	my $loc;
+	my $clth = $self->{consort} eq 'local' ? 29 : 30;
+	my $comment = substr $_[3], 0, $clth; 
+	$comment .= ' ' x ($clth - length($comment));
 	my $ref = DXUser->get_current($_[4]);
-	my $loc = $ref->qra if $ref && $ref->qra && $self->{user}->wantgrid;
-	$loc = ' ' . substr($loc, 0, 4) if $loc;
+	if ($ref) {
+		$loc = $ref->qra || '' if $self->{user}->wantgrid; 
+		$loc = ' ' . substr($loc, 0, 4) if $loc;
+	} 
 	$loc = "" unless $loc;
-	my $buf = sprintf "DX de %-7.7s%11.1f  %-12.12s %-*s $t$loc", "$_[4]:", $_[0], $_[1], $self->{consort} eq 'local' ? 29 : 30, $_[3];
+
+	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;
+	
 	$buf .= "\a\a" if $self->{beep};
 	$buf =~ s/\%5E/^/g;
 	$self->local_send('X', $buf);