X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXCommandmode.pm;h=0515a91c06f1c85c05c5ddc829adf1a3fab6d40d;hb=1ee64082ae257818e71f8ec1a471dbac31bd746a;hp=6306b7fbed905902abea96f23d9a14c219e98e31;hpb=63f0fc26e717837bc7c6990f27d26de91d65eb7e;p=spider.git

diff --git a/perl/DXCommandmode.pm b/perl/DXCommandmode.pm
index 6306b7fb..0515a91c 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;
@@ -43,7 +43,7 @@ use JSON;
 use Time::HiRes qw(gettimeofday tv_interval);
 
 use Mojo::IOLoop;
-use Mojo::IOLoop::Subprocess;
+use DXSubprocess;
 use Mojo::UserAgent;
 
 use strict;
@@ -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,7 +177,13 @@ 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('spots', $call, 0) 
+		|| Filter::read_in('spots', $nossid, 0)
+		|| Filter::read_in('rbn', 'user_default', 0)
+		|| Filter::read_in('spots', 'user_default', 0);
+	
 	# clean up qra locators
 	my $qra = $user->qra;
 	$qra = undef if ($qra && !DXBearing::is_qra($qra));
@@ -210,8 +217,7 @@ sub start
 	$script->run($self) if $script;
 
 	# send cluster info
-	my $info = Route::cluster();
-	$self->send("Cluster:$info");
+	$self->send($self->run_cmd("show/cluster"));
 
 	# send prompts for qth, name and things
 	$self->send($self->msg('namee1')) if !$user->name;
@@ -545,19 +551,16 @@ sub run_cmd
 			if ($package && $self->can("${package}::handle")) {
 				no strict 'refs';
 				dbg("cmd: package $package") if isdbg('command');
-				if (isdbg('progress')) {
-					my $s = "CMD: '$cmd' by $call ip $self->{hostname}";
-				}
 				my $t0 = [gettimeofday];
 				eval { @ans = &{"${package}::handle"}($self, $args) };
 				if ($@) {
-					dbgprintring(25);
+					DXDebug::dbgprintring(25);
 					return (DXDebug::shortmess($@));
 				}
 				if (isdbg('progress')) {
 					my $msecs = _diffms($t0);
 					my $s = "CMD: '$cmd $args' by $call ip: $self->{hostname} ${msecs}mS";
-					dbg($s);
+					dbg($s) if $cmd !~ /^(?:echo|blank)/ || isdbg('echo');     # cut down a bit on HRD and other clients' noise
 				}
 			} else {
 				dbg("cmd: $package not present") if isdbg('command');
@@ -839,7 +842,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|) {
@@ -998,12 +1001,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);
 		}
 	}
 
@@ -1320,15 +1332,15 @@ sub spawn_cmd
 		return @out;
 	}
 	
-	my $fc = Mojo::IOLoop::Subprocess->new;
+	my $fc = DXSubprocess->new;
 #	$fc->serializer(\&encode_json);
 #	$fc->deserializer(\&decode_json);
 	$fc->run(
 			 sub {
 				 my $subpro = shift;
 				 if (isdbg('progress')) {
-					 my $s = "line: $line";
-					 $s .= ", args: " . join(', ', @$args) if $args && @$args;
+					 my $s = qq{line: "$line"};
+					 $s .= ", args: " . join(', ', map { defined $_ ? qq{'$_'} : q{'undef'} } @$args) if $args && @$args;
 					 dbg($s);
 				 }
 				 eval { @out = $cmdref->(@$args); };