X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fshow%2Fdx.pl;h=6908a52779efebe6429a051661da18c79499f56e;hb=5177a6684a57135fa9602c33227c6ab1c8f32a51;hp=17a17d27e3e23e4fa0ec19a0aa092ddbb3699862;hpb=09329eacb3f485e1c746ff8f378d08d3ac5df0e7;p=spider.git

diff --git a/cmd/show/dx.pl b/cmd/show/dx.pl
index 17a17d27..6908a527 100644
--- a/cmd/show/dx.pl
+++ b/cmd/show/dx.pl
@@ -86,7 +86,7 @@ while ($f = shift @list) {		# next field
 		next;
 	}
 	if (lc $f =~ /^filt/) {
-		$dofilter = 1 if $self->spotsfilter;
+		$dofilter = 1 if $self && $self->spotsfilter;
 		next;
 	}
 	if (lc $f eq 'qsl') {
@@ -173,8 +173,13 @@ if ($pre) {
 		}
 	} 
 	unless (@ans) {
-		$pre .= '*' unless $pre =~ /[\*\?\[]/o;
+		$pre .= '*' unless $pre =~ /[\*\?\[]$/o;
 		$pre = shellregex($pre);
+		if ($main::dbh) {
+			$pre =~ s/\.\*/%/g;
+		} else {
+			$pre =~ s/\.\*\$$//;
+		}
 		$expr = "\$f1 =~ m{$pre}";
 		$pre =~ s/[\^\$]//g;
 		$hint = "m{\U$pre}";
@@ -245,6 +250,11 @@ if ($spotter) {
 		$expr .= ' && ' if $expr;
 		$spotter .= '*' unless $spotter =~ /[\*\?\[]/o;
 		$spotter = shellregex($spotter);
+		if ($main::dbh) {
+			$spotter =~ s/\.\*/%/g;
+		} else {
+			$spotter =~ s/\.\*\$$//;
+		}
 		$expr .= "\$f4 =~ m{\U$spotter}";
 		$hint .= ' && ' if $hint;
 		$spotter =~ s/[\^\$]//g;
@@ -372,7 +382,7 @@ foreach $ref (@res) {
 	if ($self && $self->ve7cc) {
 		push @out, VE7CC::dx_spot($self, @$ref);
 	} else {
-		if ($real) {
+		if ($self && $real) {
 			push @out, DXCommandmode::format_dx_spot($self, @$ref);
 		} else {
 			push @out, Spot::formatl(@$ref);