X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fshow%2Fdx.pl;h=7e4d3a3587e8d7c655820f5c560dd1d5979130d3;hb=c83b1ca22765fc07e5adcdc8dac24cbd066c9b95;hp=5387b7f407657ee5591711a0ae6a040abc5bf04b;hpb=cc9bd946788545ef87a7a6d0541fa1c47b9b034a;p=spider.git

diff --git a/cmd/show/dx.pl b/cmd/show/dx.pl
index 5387b7f4..7e4d3a35 100644
--- 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;
@@ -167,7 +163,7 @@ sub handle
 	# now do the search
 
 	if ($self->{_nospawn}) {
-		my @res = Spot::search($expr, $fromday, $today, $from, $to, $user, $dofilter ? $self : undef);
+		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;