projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix AsyncMsg.pm + clusteraddr issues
[spider.git]
/
cmd
/
show
/
dx.pl
diff --git
a/cmd/show/dx.pl
b/cmd/show/dx.pl
index ecb5dddc3dc8a36ba34750b0f52b5f1a2f94bf39..b513c614495ac40a13dc00854903da5e4a8194e0 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) = @_;
@@
-27,11
+27,14
@@
my $state;
my $bystate;
my $itu;
my $byitu;
my $bystate;
my $itu;
my $byitu;
-my $fromdxcc;
+my $fromdxcc = 0;
+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
while ($f = shift @list) { # next field
-
# print "f: $f list: ", join(',', @list), "\n"
;
+
dbg "arg: $f list: " . join(',', @list) if isdbg('shdx')
;
if (!$from && !$to) {
($from, $to) = $f =~ m|^(\d+)[-/](\d+)$|; # is it a from -> to count?
next if $from && $to > $from;
if (!$from && !$to) {
($from, $to) = $f =~ m|^(\d+)[-/](\d+)$|; # is it a from -> to count?
next if $from && $to > $from;
@@
-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;
@@
-49,17
+56,19
@@
while ($f = shift @list) { # next field
next;
}
if (lc $f eq 'on' && $list[0]) { # is it freq range?
next;
}
if (lc $f eq 'on' && $list[0]) { # is it freq range?
- # print "yup freq\n";
- if ($list[0] =~ m|^(\d+)(?:\.\d+)?[-/](\d+)(?:\.\d+)?$|) {
- push @freq, $1, $2;
+ dbg "freq $list[0]" if isdbg('shdx');
+ if (my ($from, $to) = $list[0] =~ m|^(\d+)(?:\.\d+)?(?:[-/](\d+)(?:\.\d+)?)?$|) {
+ $to = $from unless defined $to;
+ dbg "freq '$from' '$to'" if isdbg('shdx');
+ push @freq, $from, $to;
shift @list;
next;
} else {
my @r = split '/', lc $list[0];
shift @list;
next;
} else {
my @r = split '/', lc $list[0];
-
# print "r0: $r[0] r1: $r[1]\n"
;
+
dbg "r0: $r[0] r1: $r[1]" if isdbg('shdx')
;
my @fr = Bands::get_freq($r[0], $r[1]);
if (@fr) { # yup, get rid of extranous param
my @fr = Bands::get_freq($r[0], $r[1]);
if (@fr) { # yup, get rid of extranous param
-
# print "freq: ", join(',', @fr), "\n"
;
+
dbg "freq: " . join(',', @fr) if isdbg('shdx')
;
push @freq, @fr; # add these to the list
shift @list;
next;
push @freq, @fr; # add these to the list
shift @list;
next;
@@
-67,26
+76,26
@@
while ($f = shift @list) { # next field
}
}
if (lc $f eq 'day' && $list[0]) {
}
}
if (lc $f eq 'day' && $list[0]) {
- # print "got day\n";
($fromday, $today) = split m|[-/]|, shift(@list);
($fromday, $today) = split m|[-/]|, shift(@list);
+ dbg "got day $fromday/$today" if isdbg('shdx');
next;
}
if (lc $f eq 'info' && $list[0]) {
next;
}
if (lc $f eq 'info' && $list[0]) {
- # print "got info\n";
$info = shift @list;
$info = shift @list;
+ dbg "got info $info" if isdbg('shdx');
next;
}
if ((lc $f eq 'spotter' || lc $f eq 'by') && $list[0]) {
next;
}
if ((lc $f eq 'spotter' || lc $f eq 'by') && $list[0]) {
- # print "got spotter\n";
$spotter = uc shift @list;
if ($list[0] && lc $list[0] eq 'dxcc') {
$fromdxcc = 1;
shift @list;
}
$spotter = uc shift @list;
if ($list[0] && lc $list[0] eq 'dxcc') {
$fromdxcc = 1;
shift @list;
}
+ dbg "got spotter $spotter fromdxcc $fromdxcc" if isdbg('shdx');
next;
}
if (lc $f =~ /^filt/) {
next;
}
if (lc $f =~ /^filt/) {
- $dofilter = 1;
+ $dofilter = 1
if $self && $self->spotsfilter
;
next;
}
if (lc $f eq 'qsl') {
next;
}
if (lc $f eq 'qsl') {
@@
-139,6
+148,8
@@
while ($f = shift @list) { # next field
}
}
}
}
+#$DB::single = 1;
+
# first deal with the prefix
if ($pre) {
my @ans;
# first deal with the prefix
if ($pre) {
my @ans;
@@
-171,8
+182,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}";
@@
-181,8
+198,9
@@
if ($pre) {
# now deal with any frequencies specified
if (@freq) {
# now deal with any frequencies specified
if (@freq) {
- $expr .= ($expr) ? " && (" : "(";
-# $hint .= ($hint) ? " && (" : "(";
+ $expr .= ($expr) ? ' && (' : "(";
+# $hint .= ($hint) ? ' && ' : "(";
+# $hint .= ' && ' if $hint;
my $i;
for ($i = 0; $i < @freq; $i += 2) {
$expr .= "(\$f0 >= $freq[$i] && \$f0 <= $freq[$i+1]) ||";
my $i;
for ($i = 0; $i < @freq; $i += 2) {
$expr .= "(\$f0 >= $freq[$i] && \$f0 <= $freq[$i+1]) ||";
@@
-199,10
+217,10
@@
if (@freq) {
# any info
if ($info) {
# any info
if ($info) {
- $expr .=
" && "
if $expr;
+ $expr .=
' && '
if $expr;
$info =~ s{(.)}{"\Q$1"}ge;
$expr .= "\$f3 =~ m{$info}i";
$info =~ s{(.)}{"\Q$1"}ge;
$expr .= "\$f3 =~ m{$info}i";
- $hint .=
" && "
if $hint;
+ $hint .=
' && '
if $hint;
$hint .= "m{$info}i";
}
$hint .= "m{$info}i";
}
@@
-239,11
+257,16
@@
if ($spotter) {
}
}
unless (@ans) {
}
}
unless (@ans) {
- $expr .=
" && "
if $expr;
+ $expr .=
' && '
if $expr;
$spotter .= '*' unless $spotter =~ /[\*\?\[]/o;
$spotter = shellregex($spotter);
$spotter .= '*' unless $spotter =~ /[\*\?\[]/o;
$spotter = shellregex($spotter);
+ if ($usesql) {
+ $spotter =~ s/\.\*/%/g;
+ } else {
+ $spotter =~ s/\.\*\$$//;
+ }
$expr .= "\$f4 =~ m{\U$spotter}";
$expr .= "\$f4 =~ m{\U$spotter}";
- $hint .=
" && "
if $hint;
+ $hint .=
' && '
if $hint;
$spotter =~ s/[\^\$]//g;
$hint .= "m{\U$spotter}";
}
$spotter =~ s/[\^\$]//g;
$hint .= "m{\U$spotter}";
}
@@
-253,6
+276,8
@@
if ($spotter) {
if ($zone) {
my @expr;
my @hint;
if ($zone) {
my @expr;
my @hint;
+ $expr .= ' && ' if $expr;
+ $hint .= ' && ' if $hint;
for (split /[:,]/, $zone) {
push @expr, "\$f9==$_";
push @hint, "m{$_}";
for (split /[:,]/, $zone) {
push @expr, "\$f9==$_";
push @hint, "m{$_}";
@@
-263,6
+288,8
@@
if ($zone) {
if ($byzone) {
my @expr;
my @hint;
if ($byzone) {
my @expr;
my @hint;
+ $expr .= ' && ' if $expr;
+ $hint .= ' && ' if $hint;
for (split /[:,]/, $byzone) {
push @expr, "\$f11==$_";
push @hint, "m{$_}";
for (split /[:,]/, $byzone) {
push @expr, "\$f11==$_";
push @hint, "m{$_}";
@@
-275,6
+302,8
@@
if ($byzone) {
if ($itu) {
my @expr;
my @hint;
if ($itu) {
my @expr;
my @hint;
+ $expr .= ' && ' if $expr;
+ $hint .= ' && ' if $hint;
for (split /[:,]/, $itu) {
push @expr, "\$f8==$_";
push @hint, "m{$_}";
for (split /[:,]/, $itu) {
push @expr, "\$f8==$_";
push @hint, "m{$_}";
@@
-285,6
+314,8
@@
if ($itu) {
if ($byitu) {
my @expr;
my @hint;
if ($byitu) {
my @expr;
my @hint;
+ $expr .= ' && ' if $expr;
+ $hint .= ' && ' if $hint;
for (split /[:,]/, $byitu) {
push @expr, "\$f10==$_";
push @hint, "m{$_}";
for (split /[:,]/, $byitu) {
push @expr, "\$f10==$_";
push @hint, "m{$_}";
@@
-297,59
+328,75
@@
if ($byitu) {
if ($state) {
my @expr;
my @hint;
if ($state) {
my @expr;
my @hint;
+ $expr .= ' && ' if $expr;
+ $hint .= ' && ' if $hint;
for (split /[:,]/, $state) {
push @expr, "\$f12 eq '$_'";
push @hint, "m{$_}";
}
for (split /[:,]/, $state) {
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) {
my @expr;
my @hint;
$hint .= @hint > 1 ? '(' . join(' || ', @hint) . ')' : $hint[0];
}
if ($bystate) {
my @expr;
my @hint;
+ $expr .= ' && ' if $expr;
+ $hint .= ' && ' if $hint;
for (split /[:,]/, $bystate) {
push @expr, "\$f13 eq '$_'";
push @hint, "m{$_}";
}
for (split /[:,]/, $bystate) {
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];
}
# qsl requests
if ($doqsl) {
$hint .= @hint > 1 ? '(' . join(' || ', @hint) . ')' : $hint[0];
}
# qsl requests
if ($doqsl) {
- $expr .=
" && "
if $expr;
+ $expr .=
' && '
if $expr;
$expr .= "\$f3 =~ m{QSL|VIA}i";
$expr .= "\$f3 =~ m{QSL|VIA}i";
- $hint .=
" && "
if $hint;
+ $hint .=
' && '
if $hint;
$hint .= "m{QSL|VIA}i";
}
# iota requests
if ($doiota) {
$hint .= "m{QSL|VIA}i";
}
# iota requests
if ($doiota) {
- $expr .=
" && "
if $expr;
+ $expr .=
' && '
if $expr;
$expr .= "\$f3 =~ m{$doiota}i";
$expr .= "\$f3 =~ m{$doiota}i";
- $hint .=
" && "
if $hint;
+ $hint .=
' && '
if $hint;
$hint .= "m{$doiota}i";
}
# iota requests
if ($doqra) {
$hint .= "m{$doiota}i";
}
# iota requests
if ($doqra) {
- $expr .=
" && "
if $expr;
+ $expr .=
' && '
if $expr;
$expr .= "\$f3 =~ m{$doqra}i";
$expr .= "\$f3 =~ m{$doqra}i";
- $hint .=
" && "
if $hint;
+ $hint .=
' && '
if $hint;
$hint .= "m{$doqra}io";
}
$hint .= "m{$doqra}io";
}
-
#print "expr: $expr from: $from to: $to fromday: $fromday today: $today\n"
;
+
dbg "expr: $expr from: $from to: $to fromday: $fromday today: $today" if isdbg('sh/dx')
;
# now do the search
my @res = Spot::search($expr, $fromday, $today, $from, $to, $hint, $dofilter ? $self : undef);
my $ref;
my @dx;
foreach $ref (@res) {
# now do the search
my @res = Spot::search($expr, $fromday, $today, $from, $to, $hint, $dofilter ? $self : undef);
my $ref;
my @dx;
foreach $ref (@res) {
- if ($
real
) {
- push @out,
$self->format_dx_spot(
@$ref);
+ if ($
self && $self->ve7cc
) {
+ push @out,
VE7CC::dx_spot($self,
@$ref);
} else {
} else {
- push @out, Spot::formatl(@$ref);
+ if ($self && $real) {
+ push @out, DXCommandmode::format_dx_spot($self, @$ref);
+ } else {
+ push @out, Spot::formatl(@$ref);
+ }
}
}
}
}