X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXCommandmode.pm;h=e49498574415692f7543d95cf89e5c6050db791d;hb=022706c9f44ade7f23fcfa76efcdcd61c98829a7;hp=76bfa9314926046d12ed18a00a3221746f497b82;hpb=25140d3e8633cbf9e25b6528248405ec8ed125e3;p=spider.git

diff --git a/perl/DXCommandmode.pm b/perl/DXCommandmode.pm
index 76bfa931..e4949857 100644
--- a/perl/DXCommandmode.pm
+++ b/perl/DXCommandmode.pm
@@ -34,6 +34,7 @@ use Script;
 use Net::Telnet;
 use QSL;
 use DB_File;
+use VE7CC;
 
 use strict;
 use vars qw(%Cache %cmd_cache $errstr %aliases $scriptbase $maxerrors %nothereslug $maxbadcount);
@@ -418,15 +419,14 @@ sub run_cmd
 
 	return () if length $cmdline == 0;
 		
-	# strip out //
-	$cmdline =~ s|//|/|og;
-		
 	# split the command line up into parts, the first part is the command
 	my ($cmd, $args) = split /\s+/, $cmdline, 2;
 	$args = "" unless defined $args;
 		
 	if ($cmd) {
-			
+		# strip out // on command only
+		$cmd =~ s|//|/|g;
+					
 		my ($path, $fcmd);
 			
 		dbg("cmd: $cmd") if isdbg('command');
@@ -824,35 +824,22 @@ sub chat
 	$self->local_send('C', $buf);
 }
 
-# send a dx spot
-sub dx_spot
+sub format_dx_spot
 {
 	my $self = shift;
-	my $line = shift;
-	my $isolate = shift;
-	my ($filter, $hops);
 
-	return unless $self->{dx};
-	
-	if ($self->{spotsfilter}) {
-		($filter, $hops) = $self->{spotsfilter}->it(@_ );
-		return unless $filter;
-	}
-
-
-	dbg('spot: "' . join('","', @_) . '"') if isdbg('dxspot');
-	
 	my $t = ztime($_[2]);
-	my $loc;
+	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]);
-	if ($ref) {
-		$loc = $ref->qra || '' if $self->{user}->wantgrid; 
-		$loc = ' ' . substr($loc, 0, 4) if $loc;
-	} 
-	$loc = "" unless $loc;
+	if ($self->{user}->wantgrid) { 
+		my $ref = DXUser->get_current($_[4]);
+		if ($ref) {
+			$loc = $ref->qra || '';
+			$loc = ' ' . substr($loc, 0, 4) if $loc;
+		}
+	}
 
 	if ($self->{user}->wantdxitu) {
 		$loc = ' ' . sprintf("%2d", $_[10]) if defined $_[10];
@@ -865,10 +852,35 @@ sub dx_spot
 		$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;
+	return sprintf "DX de %-7.7s%11.1f  %-12.12s %-s $t$loc", "$_[4]:", $_[0], $_[1], $comment;
+}
+
+# send a dx spot
+sub dx_spot
+{
+	my $self = shift;
+	my $line = shift;
+	my $isolate = shift;
+	return unless $self->{dx};
+
+	my ($filter, $hops);
+
+	if ($self->{spotsfilter}) {
+		($filter, $hops) = $self->{spotsfilter}->it(@_ );
+		return unless $filter;
+	}
+
+	dbg('spot: "' . join('","', @_) . '"') if isdbg('dxspot');
+
+	my $buf;
+	if ($self->{ve7cc}) {
+		$buf = VE7CC::dx_spot($self, @_);
+	} else {
+		$buf = $self->format_dx_spot(@_);
+		$buf .= "\a\a" if $self->{beep};
+		$buf =~ s/\%5E/^/g;
+	}
+
 	$self->local_send('X', $buf);
 }