don't fork sh/dx on simple query

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

diff --git a/cmd/show/dx.pl b/cmd/show/dx.pl
index 6a9a3829a3a7a79f5878034703edd9a7bfb2959d..bad8ffde0894634b51009a74a63ad903e23e7e17 100644 (file)
--- a/cmd/show/dx.pl
+++ b/cmd/show/dx.pl
@@ -12,18 +12,18 @@ sub handle
        my ($self, $line) = @_;
 
        # disguise regexes
-       $line =~ s/\{(.*)\}/'{'. unpack('H*', $1) . '}'/eg;
+       $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
+       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');
+       dbg("sh/dx after regex return: '" . join(' ', @list) . "'") if isdbg('sh/dx');
        
        my @out;
        my $f;
@@ -40,23 +40,25 @@ sub handle
        my @flist;
 
        
-       dbg("sh/dx \@list: " . join(" ", @list)) if isdbg('sh/dx');
+       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');
+       while (@list) { # next field
+               $f = shift @list;
+               dbg("sh/dx arg: $f list: '" . join(',', @list) . "'") if isdbg('sh/dx');
                if ($f && !$from && !$to) {
                        ($from, $to) = $f =~ m|^(\d+)[-/](\d+)$| || (0,0); # is it a from -> to count?
                        dbg("sh/dx from: $from to: $to") if isdbg('sh/dx');
                        next if $from && $to > $from;
                }
                if ($f && !$to) {
-                       ($to) = $f =~ /^(\d+)$/o || 0 if !$to; # is it a to count?
+                       ($to) = $f =~ /^(\d+)$/o if !$to; # is it a to count?
+                       $to ||= 0;
                        dbg("sh/dx to: $to") if isdbg('sh/dx');
                        next if $to;
                }
                if (lc $f eq 'day' && $list[0]) {
                        ($fromday, $today) = split m|[-/]|, shift(@list);
-                       dbg "sh/dx got day $fromday/$today" if isdbg('sh/dx');
+                       dbg("sh/dx got day $fromday/$today") if isdbg('sh/dx');
                        next;
                }
                if (lc $f eq 'exact') {
@@ -79,6 +81,22 @@ sub handle
                        push @flist, "info {QSL|VIA}";
                        next;
                }
+               if (lc $f eq '<es>') {
+                       dbg("sh/dx <es>") if isdbg('sh/dx');
+                       push @flist, "info {<ES>}";
+                       next;
+               }
+               if (lc $f eq '<tr>') {
+                       dbg("sh/dx <es>") if isdbg('sh/dx');
+                       push @flist, "info {<TR>}";
+                       next;
+               }
+               if (lc $f eq '<ms>') {
+                       dbg("sh/dx <ms>") if isdbg('sh/dx');
+                       push @flist, "info {<ms>}";
+                       next;
+               }
+
                if (lc $f eq 'iota') {
                        my $doiota;
                        if (@list && $list[0] && (($a, $b) = $list[0] =~ /(AF|AN|NA|SA|EU|AS|OC)[-\s]?(\d\d?\d?)/i)) {
@@ -103,7 +121,7 @@ sub handle
                        dbg("sh/dx operator $f") if isdbg('sh/dx');
                        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) ) {
+               if (grep {lc $f eq $_} qw(on freq call info spotter by dxcc call_dxcc by_dxcc bydxcc origin call_itu itu call_zone zone cq bycq  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');
@@ -116,6 +134,7 @@ sub handle
                push @flist, $f;
        }
 
+       dbg("sh/dx: flist = '" . join(',', @flist). "'") if isdbg('sh/dx');
        
        if ($pre) {
                # someone (probably me) has forgotten the 'info' keyword
@@ -124,11 +143,7 @@ sub handle
                } else {
                        $pre .= '*' unless $pre =~ /[\*\?\[]$/o;
                        $pre = shellregex($pre);
-                       if ($usesql) {
-                               $pre =~ s/\.\*/%/g;
-                       } else {
-                               $pre =~ s/\.\*\$$//;
-                       }
+                       $pre =~ s/\.\*\$$//;
                        $pre .= '$' if $exact;
                        $pre =~ s/\^//;
                        push @flist, 'call', $pre;
@@ -136,18 +151,19 @@ sub handle
        }
        
     my $newline = join(' ', @flist);
-       dbg("sh/dx newline: $newline") if isdbg('sh/dx');
+       dbg("sh/dx newline: '$newline'") if isdbg('sh/dx');
        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');
+       $expr ||= '';
+       dbg("sh/dx user: $user expr: $expr from: $from to: $to fromday: $fromday today: $today") if isdbg('sh/dx');
   
        # now do the search
 
-       if ($self->{_nospawn}) {
-               my @res = Spot::search($expr, $fromday, $today, $from, $to, $user, $dofilter ? $self : undef);
+       if ($self->{_nospawn} || ($Spot::spotcachedays && !$expr && $from == 0 && $fromday == 0 && $today == 0)) {
+               my @res = Spot::search($expr, $fromday, $today, $from, $to, $user, $dofilter, $self);
                my $ref;
                my @dx;
                foreach $ref (@res) {
@@ -166,7 +182,7 @@ sub handle
        }
        else {
                push @out, $self->spawn_cmd("sh/dx $line", \&Spot::search, 
-                                                                       args => [$expr, $fromday, $today, $from, $to, $filter, $dofilter ? $self : undef],
+                                                                       args => [$expr, $fromday, $today, $from, $to, $filter, $dofilter, $self],
                                                                        cb => sub {
                                                                                my ($dxchan, @res) = @_; 
                                                                                my $ref;