projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
more UPGRADE mods.
[spider.git]
/
cmd
/
show
/
dx.pl
diff --git
a/cmd/show/dx.pl
b/cmd/show/dx.pl
index ddc29bbab419a1f513c3b84f8f40cf9e52214a26..171b5efd78e7fbc86471810007cad1ec0eb4ff5b 100644
(file)
--- a/
cmd/show/dx.pl
+++ b/
cmd/show/dx.pl
@@
-1,7
+1,7
@@
#
# show dx (normal)
#
#
# show dx (normal)
#
-#
$Id$
+#
#
my ($self, $line) = @_;
#
my ($self, $line) = @_;
@@
-28,8
+28,11
@@
my $bystate;
my $itu;
my $byitu;
my $fromdxcc;
my $itu;
my $byitu;
my $fromdxcc;
+my $exact;
my ($doqsl, $doiota, $doqra, $dofilter);
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) {
@@
-40,6
+43,10
@@
while ($f = shift @list) { # next field
($to) = $f =~ /^(\d+)$/o if !$to; # is it a to count?
next if $to;
}
($to) = $f =~ /^(\d+)$/o if !$to; # is it a to count?
next if $to;
}
+ if (lc $f eq 'exact') {
+ $exact = 1;
+ next;
+ }
if (lc $f eq 'dxcc') {
$dxcc = 1;
next;
if (lc $f eq 'dxcc') {
$dxcc = 1;
next;
@@
-86,7
+93,7
@@
while ($f = shift @list) { # next field
next;
}
if (lc $f =~ /^filt/) {
next;
}
if (lc $f =~ /^filt/) {
- $dofilter = 1 if $self->spotsfilter;
+ $dofilter = 1 if $self
&& $self
->spotsfilter;
next;
}
if (lc $f eq 'qsl') {
next;
}
if (lc $f eq 'qsl') {
@@
-173,8
+180,14
@@
if ($pre) {
}
}
unless (@ans) {
}
}
unless (@ans) {
- $pre .= '*' unless $pre =~ /[\*\?\[]/o;
+ $pre .= '*' unless $pre =~ /[\*\?\[]
$
/o;
$pre = shellregex($pre);
$pre = shellregex($pre);
+ if ($usesql) {
+ $pre =~ s/\.\*/%/g;
+ } else {
+ $pre =~ s/\.\*\$$//;
+ }
+ $pre .= '$' if $exact;
$expr = "\$f1 =~ m{$pre}";
$pre =~ s/[\^\$]//g;
$hint = "m{\U$pre}";
$expr = "\$f1 =~ m{$pre}";
$pre =~ s/[\^\$]//g;
$hint = "m{\U$pre}";
@@
-245,6
+258,11
@@
if ($spotter) {
$expr .= ' && ' if $expr;
$spotter .= '*' unless $spotter =~ /[\*\?\[]/o;
$spotter = shellregex($spotter);
$expr .= ' && ' if $expr;
$spotter .= '*' unless $spotter =~ /[\*\?\[]/o;
$spotter = shellregex($spotter);
+ if ($usesql) {
+ $spotter =~ s/\.\*/%/g;
+ } else {
+ $spotter =~ s/\.\*\$$//;
+ }
$expr .= "\$f4 =~ m{\U$spotter}";
$hint .= ' && ' if $hint;
$spotter =~ s/[\^\$]//g;
$expr .= "\$f4 =~ m{\U$spotter}";
$hint .= ' && ' if $hint;
$spotter =~ s/[\^\$]//g;
@@
-314,7
+332,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 ($usesql) {
+ $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
+348,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 ($usesql) {
+ $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];
}
@@
-361,11
+387,11
@@
my @res = Spot::search($expr, $fromday, $today, $from, $to, $hint, $dofilter ? $
my $ref;
my @dx;
foreach $ref (@res) {
my $ref;
my @dx;
foreach $ref (@res) {
- if ($self->ve7cc) {
+ if ($self
&& $self
->ve7cc) {
push @out, VE7CC::dx_spot($self, @$ref);
} else {
push @out, VE7CC::dx_spot($self, @$ref);
} else {
- if ($real) {
- push @out,
$self->format_dx_spot(
@$ref);
+ if ($
self && $
real) {
+ push @out,
DXCommandmode::format_dx_spot($self,
@$ref);
} else {
push @out, Spot::formatl(@$ref);
}
} else {
push @out, Spot::formatl(@$ref);
}