Improve M$ Windows compatibility

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

diff --git a/cmd/show/dx.pl b/cmd/show/dx.pl
index 5387b7f407657ee5591711a0ae6a040abc5bf04b..a7ee33d5e1062f5b5651a12be4df7cf5eb29ab36 100644 (file)
--- a/cmd/show/dx.pl
+++ b/cmd/show/dx.pl
@@ -41,6 +41,8 @@ sub handle
 
        
        dbg("sh/dx list: " . join(" ", @list)) if isdbg('sh/dx');
+
+#      $DB::single=1;
        
        while (@list) { # next field
                $f = shift @list;
@@ -143,11 +145,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 +164,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} || $main::is_win == 1) || ($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) {
@@ -179,14 +177,14 @@ sub handle
                                        push @out, DXCommandmode::format_dx_spot($self, @$ref);
                                }
                                else {
-                                       push @out, Spot::formatl(@$ref);
+                                       push @out, Spot::formatl($self->{width}, @$ref);
                                }
                        }
                }
        }
        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;
@@ -201,7 +199,7 @@ sub handle
                                                                                                        push @out, DXCommandmode::format_dx_spot($self, @$ref);
                                                                                                }
                                                                                                else {
-                                                                                                       push @out, Spot::formatl(@$ref);
+                                                                                                       push @out, Spot::formatl($self->{width}, @$ref);
                                                                                                }
                                                                                        }
                                                                                }