fix // in talk

[spider.git] / perl / DXCommandmode.pm

diff --git a/perl/DXCommandmode.pm b/perl/DXCommandmode.pm
index 76bfa9314926046d12ed18a00a3221746f497b82..ac141b363cd0942462f6f0634fc17a5852117869 100644 (file)
--- a/perl/DXCommandmode.pm
+++ b/perl/DXCommandmode.pm
@@ -418,15 +418,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,24 +823,10 @@ 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 $clth = $self->{consort} eq 'local' ? 29 : 30;
@@ -865,8 +850,27 @@ 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;
+       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;
+       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;
        $self->local_send('X', $buf);