X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXCommandmode.pm;h=898a639720013e9c1e54d563f8ebf14f3bce2b04;hb=1b28f13d136ceecc638e66fa427f226bdca83346;hp=a75bf157a699b2ae16a0078903858ba4df8453bb;hpb=4a134278a40e451ff1769c7b98d1a4f709a6b828;p=spider.git

diff --git a/perl/DXCommandmode.pm b/perl/DXCommandmode.pm
index a75bf157..898a6397 100644
--- a/perl/DXCommandmode.pm
+++ b/perl/DXCommandmode.pm
@@ -139,9 +139,6 @@ sub start
 	$self->{here} = 1;
 	$self->{prompt} = $user->prompt if $user->prompt;
 	$self->{lastmsgpoll} = 0;
-	$self->{rbn} = $user->wantrbn;
-	$self->{ft} = $user->wantft;
-	$self->{cw} = $user->wantcw;
 
 	# sort out new dx spot stuff
 	$user->wantdxcq(0) unless defined $user->{wantdxcq};
@@ -179,6 +176,9 @@ sub start
 	$self->{annfilter} = Filter::read_in('ann', $call, 0) 
 		|| Filter::read_in('ann', $nossid, 0) 
 			|| Filter::read_in('ann', 'user_default', 0) ;
+	$self->{rbnfilter} = Filter::read_in('rbn', $call, 0) 
+		|| Filter::read_in('rbn', $nossid, 0)
+			|| Filter::read_in('rbn', 'user_default', 0);
 
 	# clean up qra locators
 	my $qra = $user->qra;
@@ -997,12 +997,21 @@ sub format_dx_spot
 	my $loc = '';
 	my $clth = $self->{consort} eq 'local' ? 29 : 30;
 	my $comment = substr (($_[3] || ''), 0, $clth);
-	$comment .= ' ' x ($clth - length($comment));
+	$comment .= ' ' x ($clth - (length($comment)));
+	if ($self->{user}->wantgrid) {
+		my $ref = DXUser::get_current($_[1]);
+		if ($ref && $ref->qra) {
+			$loc = ' ' . substr($ref->qra, 0, 4);
+			$comment = substr $comment, 0,  ($clth - (length($comment)+length($loc)));
+			$comment .= $loc;
+			$loc = '';
+		}
+	}
+	
 	if ($self->{user}->wantgrid) {
 		my $ref = DXUser::get_current($_[4]);
-		if ($ref) {
-			$loc = $ref->qra || '';
-			$loc = ' ' . substr($loc, 0, 4) if $loc;
+		if ($ref && $ref->qra) {
+			$loc = ' ' . substr($ref->qra, 0, 4);
 		}
 	}