projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
more QSL changes
[spider.git]
/
cmd
/
show
/
dx.pl
diff --git
a/cmd/show/dx.pl
b/cmd/show/dx.pl
index 1203cb3b2abc99de6659339d2d871faa73c9bca6..fd3adeb0c2a9e0520968f81c7c2a6e7b32436f56 100644
(file)
--- a/
cmd/show/dx.pl
+++ b/
cmd/show/dx.pl
@@
-314,7
+314,11
@@
if ($state) {
push @expr, "\$f12 eq '$_'";
push @hint, "m{$_}";
}
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) {
$hint .= @hint > 1 ? '(' . join(' || ', @hint) . ')' : $hint[0];
}
if ($bystate) {
@@
-326,7
+330,11
@@
if ($bystate) {
push @expr, "\$f13 eq '$_'";
push @hint, "m{$_}";
}
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];
}
$hint .= @hint > 1 ? '(' . join(' || ', @hint) . ')' : $hint[0];
}
@@
-365,7
+373,7
@@
foreach $ref (@res) {
push @out, VE7CC::dx_spot($self, @$ref);
} else {
if ($real) {
push @out, VE7CC::dx_spot($self, @$ref);
} else {
if ($real) {
- push @out, $self->format_dx_spot($ref);
+ push @out, $self->format_dx_spot(
@
$ref);
} else {
push @out, Spot::formatl(@$ref);
}
} else {
push @out, Spot::formatl(@$ref);
}