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 174071f8bc3b8f20edf2262ca912974ba0e4b228..655630ce798b24baee204c2899230095b2db3b90 100644 (file)
--- a/cmd/show/dx.pl
+++ b/cmd/show/dx.pl
@@ -5,28 +5,43 @@
 #
 
 require 5.10.1;
+use warnings;
 
 sub handle
 {
        my ($self, $line) = @_;
-       my @list = split /\s+/, $line; # split the line up
 
+       # 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;
        my $usesql = $main::dbh && $Spot::use_db_for_search;
-       my ($from, $to);
-       my ($fromday, $today);
+       my ($from, $to) = (0, 0);
+       my ($fromday, $today) = (0, 0);
        my $exact;
        my $real;
-       my $user;
-       my $expr;
        my $dofilter;
        my $pre;
        my $dxcc;
 
        my @flist;
 
+       
+       dbg("sh/dx \@list: " . join(" ", @list)) if isdbg('sh/dx');
+       
        while ($f = shift @list) {      # next field
                dbg "sh/dx arg: $f list: " . join(',', @list) if isdbg('sh/dx');
                if (!$from && !$to) {
@@ -59,11 +74,6 @@ sub handle
                        $dofilter = 1 if $self && $self->spotsfilter;
                        next;
                }
-               if (lc $f eq 'spotter') {
-                       dbg("sh/dx by") if isdbg('sh/dx');
-                       push @flist, 'by';
-                       next;
-               }
                if (lc $f eq 'qsl') {
                        dbg("sh/dx qsl") if isdbg('sh/dx');
                        push @flist, "info {QSL|VIA}";
@@ -71,27 +81,32 @@ sub handle
                }
                if (lc $f eq 'iota') {
                        my $doiota;
-                       if (@list && $list[0] && (($a, $b) = $list[0] =~ /(AF|AN|NA|SA|EU|AS|OC)-?(\d?\d\d)/oi)) {
+                       if (@list && $list[0] && (($a, $b) = $list[0] =~ /(AF|AN|NA|SA|EU|AS|OC)[-\s]?(\d\d?\d?)/i)) {
                                $a = uc $a;
                                $doiota = "\\b$a\[\-\ \]\?$b\\b";
                                shift @list;
                        }
-                       $doiota = '\b(IOTA|(AF|AN|NA|SA|EU|AS|OC)[- ]?\d?\d\d)\b' unless $doiota;
-                       push @flist, "info {$doiota}";
-                       dbg("sh/dx iota") if isdbg('sh/dx');
+                       $doiota = '\b(IOTA|(AF|AN|NA|SA|EU|AS|OC)[-\s]?\d?\d\d)\b' unless $doiota;
+                       push @flist, 'info', "{$doiota}";
+                       dbg("sh/dx iota info {$doiota}") if isdbg('sh/dx');
                        next;
                }
                if (lc $f eq 'qra') {
-                       my $doqra = uc shift @list if @list && $list[0] =~ /[A-Z][A-Z]\d\d/oi;
+                       my $doqra = uc shift @list if @list && $list[0] =~ /[A-Z][A-Z]\d\d/i;
                        $doqra = '\b([A-Z][A-Z]\d\d|[A-Z][A-Z]\d\d[A-Z][A-Z])\b' unless $doqra;
-                       push @flist, "info {$doqra}";
-                       dbg("sh/dx qra") if isdbg('sh/dx');
+                       push @flist, 'info',  "{$doqra}";
+                       dbg("sh/dx qra info {$doqra}") if isdbg('sh/dx');
+                       next;
+               }
+               if (grep {lc $f eq $_} qw { ( or and not ) }) {
+                       push @flist, $f;
+                       dbg("sh/dx operator $f") if isdbg('sh/dx');
                        next;
                }
-               if (grep {lc $f eq $_} qw(zone byzone by_zone itu byitu by_itu state bystate by_state on) ) {
-                       $f =~ s/^by(\w)/by_$1/;
+               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) ) {
                        push @flist, $f;
                        push @flist, shift @list if @list;
+                       dbg("sh/dx function $flist[-2] $flist[-1]") if isdbg('sh/dx');
                        next;
                }
                unless ($pre) {
@@ -103,17 +118,21 @@ sub handle
 
        
        if ($pre) {
-               $pre .= '*' unless $pre =~ /[\*\?\[]$/o;
-               $pre = shellregex($pre);
-               if ($usesql) {
-                       $pre =~ s/\.\*/%/g;
+               # someone (probably me) has forgotten the 'info' keyword
+               if ($pre =~ /^{.*}$/) {
+                       push @flist, 'info', $pre;
                } else {
-                       $pre =~ s/\.\*\$$//;
+                       $pre .= '*' unless $pre =~ /[\*\?\[]$/o;
+                       $pre = shellregex($pre);
+                       if ($usesql) {
+                               $pre =~ s/\.\*/%/g;
+                       } else {
+                               $pre =~ s/\.\*\$$//;
+                       }
+                       $pre .= '$' if $exact;
+                       $pre =~ s/\^//;
+                       push @flist, 'call', $pre;
                }
-               $pre .= '$' if $exact;
-               $pre =~ s/\^//;
-               
-               push @flist, 'call', $pre;
        }
        
     my $newline = join(' ', @flist);
@@ -121,7 +140,8 @@ sub handle
        my ($r, $filter, $fno, $user, $expr) = $Spot::filterdef->parse($self, 'spots', $newline, 1);
 
        return (0, "sh/dx parse error '$r' " . $filter) if $r;
-       
+
+       $user ||= '';
        dbg "sh/dx user: $user expr: $expr from: $from to: $to fromday: $fromday today: $today" if isdbg('sh/dx');
   
        # now do the search