X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fshow%2Fdx.pl;h=fd3adeb0c2a9e0520968f81c7c2a6e7b32436f56;hb=da65011693cc9a7a33f09424f7a19a51937d986c;hp=ddc29bbab419a1f513c3b84f8f40cf9e52214a26;hpb=2bf2007a3020b6cd6d230b3bc9ccccb59f858417;p=spider.git diff --git a/cmd/show/dx.pl b/cmd/show/dx.pl index ddc29bba..fd3adeb0 100644 --- a/cmd/show/dx.pl +++ b/cmd/show/dx.pl @@ -314,7 +314,11 @@ if ($state) { push @expr, "\$f12 eq '$_'"; push @hint, "m{$_}"; } - $expr .= @expr > 1 ? '($f12 && (' . join(' || ', @expr) . '))' : "(\$f12 && $expr[0])"; + if ($main::dbh) { + $expr .= @expr > 1 ? '(' . join(' || ', @expr) . ')' : "$expr[0]"; + } else { + $expr .= @expr > 1 ? '(\$f12 && (' . join(' || ', @expr) . '))' : "(\$f12 && $expr[0])"; + } $hint .= @hint > 1 ? '(' . join(' || ', @hint) . ')' : $hint[0]; } if ($bystate) { @@ -326,7 +330,11 @@ if ($bystate) { push @expr, "\$f13 eq '$_'"; push @hint, "m{$_}"; } - $expr .= @expr > 1 ? '($f13 && (' . join(' || ', @expr) . '))' : "(\$f13 && $expr[0])"; + if ($main::dbh) { + $expr .= @expr > 1 ? '(' . join(' || ', @expr) . ')' : "$expr[0]"; + } else { + $expr .= @expr > 1 ? '(\$f13 && (' . join(' || ', @expr) . '))' : "(\$f13 && $expr[0])"; + } $hint .= @hint > 1 ? '(' . join(' || ', @hint) . ')' : $hint[0]; }