X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fshow%2Fdx.pl;h=6908a52779efebe6429a051661da18c79499f56e;hb=9335fc83d6c885d49ac336e7058a5d5657da97cd;hp=0728c650dbd20918d580788d91f0bcd52fa9c537;hpb=fb1f41921af1910c36bb1afaa2913feaf7e525b9;p=spider.git diff --git a/cmd/show/dx.pl b/cmd/show/dx.pl index 0728c650..6908a527 100644 --- a/cmd/show/dx.pl +++ b/cmd/show/dx.pl @@ -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;