add spotted and spotter DXGrid if available

[spider.git] / perl / DXCommandmode.pm

diff --git a/perl/DXCommandmode.pm b/perl/DXCommandmode.pm
index aa6f743d39d3657546cee962364193c26b4ac044..e49498574415692f7543d95cf89e5c6050db791d 100644 (file)
--- 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');
@@ -829,16 +829,17 @@ sub format_dx_spot
        my $self = shift;
 
        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];
@@ -860,20 +861,26 @@ sub dx_spot
        my $self = shift;
        my $line = shift;
        my $isolate = shift;
+       return unless $self->{dx};
+
        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 $buf = $self->format_dx_spot(@_);
-       $buf .= "\a\a" if $self->{beep};
-       $buf =~ s/\%5E/^/g;
+
+       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);
 }