X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXCommandmode.pm;h=3eb9a1c6ce7ff153bebb30db4affbc9cf59dc227;hb=ac50e257915950df8af50b2fec79bfbcc721a874;hp=6fbe90482f23dcaae9b34db21c97f877c15e5618;hpb=ad7e69f78ee4c0593e1d7576a7c1fd3b13931f84;p=spider.git

diff --git a/perl/DXCommandmode.pm b/perl/DXCommandmode.pm
index 6fbe9048..3eb9a1c6 100644
--- a/perl/DXCommandmode.pm
+++ b/perl/DXCommandmode.pm
@@ -54,9 +54,6 @@ $cmdimportdir = "$main::root/cmd_import"; # the base directory for importing com
                                           # this does not exist as default, you need to create it manually
 					  #
 
-use vars qw($VERSION $BRANCH);
-($VERSION, $BRANCH) = dxver(q$Revision$);
-
 #
 # obtain a new connection this is derived from dxchannel
 #
@@ -384,11 +381,11 @@ sub send_talks
 	
 	my ($to, $via) = $ent =~ /(\S+)>(\S+)/;
 	$to = $ent unless $to;
-	my $call = $via ? $via : $to;
+	my $call = $via && $via ne '*' ? $via : $to;
 	my $clref = Route::get($call);
 	my $dxchan = $clref->dxchan if $clref;
 	if ($dxchan) {
-		$dxchan->talk($self->{call}, $to, $via, $line);
+		$dxchan->talk($self->{call}, $to, undef, $line);
 	} else {
 		$self->send($self->msg('disc2', $via ? $via : $to));
 		my @l = grep { $_ ne $ent } @{$self->{talklist}};
@@ -830,7 +827,7 @@ sub local_send
 # send a talk message here
 sub talk
 {
-	my ($self, $from, $to, $via, $line) = @_;
+	my ($self, $from, $to, $via, $line, $onode) = @_;
 	$line =~ s/\\5E/\^/g;
 	if ($self->{talk}) {
 		if ($self->{gtk}) {
@@ -839,7 +836,7 @@ sub talk
 			$self->local_send('T', "$to de $from: $line");
 		}
 	}
-	Log('talk', $to, $from, $via?$via:$main::mycall, $line);
+	Log('talk', $to, $from, '<' . ($onode || '*'), $line);
 	# send a 'not here' message if required
 	unless ($self->{here} && $from ne $to) {
 		my $key = "$to$from";
@@ -923,9 +920,9 @@ sub format_dx_spot
 	my $t = ztime($_[2]);
 	my $loc = '';
 	my $clth = $self->{consort} eq 'local' ? 29 : 30;
-	my $comment = substr $_[3], 0, $clth; 
+	my $comment = substr (($_[3] || ''), 0, $clth);
 	$comment .= ' ' x ($clth - length($comment));
-	if ($self->{user}->wantgrid) { 
+	if ($self->{user}->wantgrid) {
 		my $ref = DXUser->get_current($_[4]);
 		if ($ref) {
 			$loc = $ref->qra || '';
@@ -1174,5 +1171,12 @@ sub import_cmd
 		}
 	}
 }
+
+sub print_find_reply
+{
+	my ($self, $node, $target, $flag, $ms) = @_;
+	my $sort = $flag == 2 ? "External" : "Local";
+	$self->send("$sort $target found at $node in $ms ms" );
+}
 1;
 __END__