added changes for VE7CC's windows programs. There may be more soon.

[spider.git] / perl / DXCommandmode.pm

diff --git a/perl/DXCommandmode.pm b/perl/DXCommandmode.pm
index aa6f743d39d3657546cee962364193c26b4ac044..5c3699a38190c25f37b6c9d168e6d58ec83080a3 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');
@@ -860,20 +860,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);
 }