X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXCommandmode.pm;h=21cd9836861ccf0c775a4cc026b5e9026ae98498;hb=ed8410c2bbe30339d13fdb8f602fd30918469e47;hp=a31cc4dee92c82b241941001d67c46530b685fe9;hpb=9d190c7619d08c4d2e82b8ec3a9e5c84dac9b26a;p=spider.git

diff --git a/perl/DXCommandmode.pm b/perl/DXCommandmode.pm
index a31cc4de..21cd9836 100644
--- a/perl/DXCommandmode.pm
+++ b/perl/DXCommandmode.pm
@@ -13,7 +13,7 @@ package DXCommandmode;
 
 @ISA = qw(DXChannel);
 
-require 5.10.1;
+use 5.10.1;
 
 use POSIX qw(:math_h);
 use DXUtil;
@@ -136,6 +136,7 @@ sub start
 	$self->{dx} = $user->wantdx;
 	$self->{logininfo} = $user->wantlogininfo;
 	$self->{ann_talk} = $user->wantann_talk;
+	$self->{wantrbn} = $user->wantrbn;
 	$self->{here} = 1;
 	$self->{prompt} = $user->prompt if $user->prompt;
 	$self->{lastmsgpoll} = 0;
@@ -176,6 +177,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;
@@ -835,7 +839,7 @@ sub find_cmd_name {
 		};
 		
 		#wrap the code into a subroutine inside our unique package
-		my $eval = qq(package DXCommandmode::$package; use POSIX qw{:math_h}; use DXLog; use DXDebug; use DXUser; use DXUtil; our \@ISA = qw{DXCommandmode}; );
+		my $eval = qq(package DXCommandmode::$package; use 5.10.1; use POSIX qw{:math_h}; use DXLog; use DXDebug; use DXUser; use DXUtil; our \@ISA = qw{DXCommandmode}; );
 
 
 		if ($sub =~ m|\s*sub\s+handle\n|) {
@@ -994,12 +998,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);
 		}
 	}