fix regex parse in sh/dx, add DXBearing::distance

[spider.git] / cmd / show / dx.pl

diff --git a/cmd/show/dx.pl b/cmd/show/dx.pl
index c9d85c4bef562da88c0de932a8dc5136b56cf712..655630ce798b24baee204c2899230095b2db3b90 100644 (file)
--- a/cmd/show/dx.pl
+++ b/cmd/show/dx.pl
@@ -11,10 +11,20 @@ sub handle
 {
        my ($self, $line) = @_;
 
+       # disguise regexes
+       $line =~ s/\{(.*)\}/'{'. unpack('H*', $1) . '}'/eg;
+       dbg("sh/dx disguise any regex: '$line'") if isdbg('sh/dx');
+
+       # now space out brackets and !
        $line =~ s/([\(\!\)])/ $1 /g;
        
        my @list = split /[\s]+/, $line; # split the line up
 
+       # put back the regexes 
+       @list = map { my $l = $_; $l =~ s/\{([0-9a-fA-F]+)\}/'{' . pack('H*', $1) . '}'/eg; $l } @list;
+
+       dbg("sh/dx after regex return: " . join(' ', @list)) if isdbg('sh/dx');
+       
        my @out;
        my $f;
        my $call = $self->call;
@@ -94,7 +104,6 @@ sub handle
                        next;
                }
                if (grep {lc $f eq $_} qw(on freq call info spotter by call_dxcc by_dxcc bydxcc origin call_itu itu call_zone zone  byitu by_itu by_zone byzone call_state state bystate by_state ip) ) {
-                       $f =~ s/^by(\w)/by_$1/;
                        push @flist, $f;
                        push @flist, shift @list if @list;
                        dbg("sh/dx function $flist[-2] $flist[-1]") if isdbg('sh/dx');