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 5387b7f407657ee5591711a0ae6a040abc5bf04b..bad8ffde0894634b51009a74a63ad903e23e7e17 100644 (file)
--- a/cmd/show/dx.pl
+++ b/cmd/show/dx.pl
@@ -143,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;
@@ -166,8 +162,8 @@ sub handle
   
        # 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) {
@@ -186,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;