projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
try to prevent $myalias calls being set to nodes
[spider.git]
/
cmd
/
show
/
dx.pl
diff --git
a/cmd/show/dx.pl
b/cmd/show/dx.pl
index b65f0f8275a54cbc6d0c9511aa90ecf3843d35ec..1170a3447e5e333d3c1659458ecf8f04d811a33b 100644
(file)
--- a/
cmd/show/dx.pl
+++ b/
cmd/show/dx.pl
@@
-32,6
+32,8
@@
my $fromdxcc;
my $exact;
my ($doqsl, $doiota, $doqra, $dofilter);
my $exact;
my ($doqsl, $doiota, $doqra, $dofilter);
+my $usesql = $main::dbh && $Spot::use_db_for_search;
+
while ($f = shift @list) { # next field
# print "f: $f list: ", join(',', @list), "\n";
if (!$from && !$to) {
while ($f = shift @list) { # next field
# print "f: $f list: ", join(',', @list), "\n";
if (!$from && !$to) {
@@
-181,7
+183,7
@@
if ($pre) {
unless (@ans) {
$pre .= '*' unless $pre =~ /[\*\?\[]$/o;
$pre = shellregex($pre);
unless (@ans) {
$pre .= '*' unless $pre =~ /[\*\?\[]$/o;
$pre = shellregex($pre);
- if ($
main::dbh
) {
+ if ($
usesql
) {
$pre =~ s/\.\*/%/g;
} else {
$pre =~ s/\.\*\$$//;
$pre =~ s/\.\*/%/g;
} else {
$pre =~ s/\.\*\$$//;
@@
-257,7
+259,7
@@
if ($spotter) {
$expr .= ' && ' if $expr;
$spotter .= '*' unless $spotter =~ /[\*\?\[]/o;
$spotter = shellregex($spotter);
$expr .= ' && ' if $expr;
$spotter .= '*' unless $spotter =~ /[\*\?\[]/o;
$spotter = shellregex($spotter);
- if ($
main::dbh
) {
+ if ($
usesql
) {
$spotter =~ s/\.\*/%/g;
} else {
$spotter =~ s/\.\*\$$//;
$spotter =~ s/\.\*/%/g;
} else {
$spotter =~ s/\.\*\$$//;
@@
-331,7
+333,7
@@
if ($state) {
push @expr, "\$f12 eq '$_'";
push @hint, "m{$_}";
}
push @expr, "\$f12 eq '$_'";
push @hint, "m{$_}";
}
- if ($
main::dbh
) {
+ if ($
usesql
) {
$expr .= @expr > 1 ? '(' . join(' || ', @expr) . ')' : "$expr[0]";
} else {
$expr .= @expr > 1 ? '(\$f12 && (' . join(' || ', @expr) . '))' : "(\$f12 && $expr[0])";
$expr .= @expr > 1 ? '(' . join(' || ', @expr) . ')' : "$expr[0]";
} else {
$expr .= @expr > 1 ? '(\$f12 && (' . join(' || ', @expr) . '))' : "(\$f12 && $expr[0])";
@@
-347,7
+349,7
@@
if ($bystate) {
push @expr, "\$f13 eq '$_'";
push @hint, "m{$_}";
}
push @expr, "\$f13 eq '$_'";
push @hint, "m{$_}";
}
- if ($
main::dbh
) {
+ if ($
usesql
) {
$expr .= @expr > 1 ? '(' . join(' || ', @expr) . ')' : "$expr[0]";
} else {
$expr .= @expr > 1 ? '(\$f13 && (' . join(' || ', @expr) . '))' : "(\$f13 && $expr[0])";
$expr .= @expr > 1 ? '(' . join(' || ', @expr) . ')' : "$expr[0]";
} else {
$expr .= @expr > 1 ? '(\$f13 && (' . join(' || ', @expr) . '))' : "(\$f13 && $expr[0])";
@@
-383,7
+385,7
@@
if ($doqra) {
# now do the search
# now do the search
-push @out, $self->spawn_cmd(\&Spot::search,
+push @out, $self->spawn_cmd(
"sh/dx $line",
\&Spot::search,
args => [$expr, $fromday, $today, $from, $to, $hint, $dofilter ? $self : undef],
cb => sub {
my ($dxchan, @res) = @_;
args => [$expr, $fromday, $today, $from, $to, $hint, $dofilter ? $self : undef],
cb => sub {
my ($dxchan, @res) = @_;