projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add uref for call in edu
[spider.git]
/
cmd
/
show
/
dx.pl
diff --git
a/cmd/show/dx.pl
b/cmd/show/dx.pl
index daf77a3d87dd0a7a3f13113f78185048db17ed19..1203cb3b2abc99de6659339d2d871faa73c9bca6 100644
(file)
--- a/
cmd/show/dx.pl
+++ b/
cmd/show/dx.pl
@@
-86,7
+86,7
@@
while ($f = shift @list) { # next field
next;
}
if (lc $f =~ /^filt/) {
next;
}
if (lc $f =~ /^filt/) {
- $dofilter = 1 if $self->
{spotfilter}
;
+ $dofilter = 1 if $self->
spotsfilter
;
next;
}
if (lc $f eq 'qsl') {
next;
}
if (lc $f eq 'qsl') {
@@
-139,6
+139,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;
@@
-181,8
+183,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
+202,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
+242,11
@@
if ($spotter) {
}
}
unless (@ans) {
}
}
unless (@ans) {
- $expr .=
" && "
if $expr;
+ $expr .=
' && '
if $expr;
$spotter .= '*' unless $spotter =~ /[\*\?\[]/o;
$spotter = shellregex($spotter);
$expr .= "\$f4 =~ m{\U$spotter}";
$spotter .= '*' unless $spotter =~ /[\*\?\[]/o;
$spotter = shellregex($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
+256,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
+268,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
+282,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
+294,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,6
+308,8
@@
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{$_}";
@@
-307,6
+320,8
@@
if ($state) {
if ($bystate) {
my @expr;
my @hint;
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{$_}";
@@
-317,25
+332,25
@@
if ($bystate) {
# qsl requests
if ($doqsl) {
# 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";
}
@@
-346,10
+361,14
@@
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 ($
real
) {
- push @out,
$self->format_dx_spot(
@$ref);
+ if ($
self->ve7cc
) {
+ push @out,
VE7CC::dx_spot($self,
@$ref);
} else {
} else {
- push @out, Spot::formatl(@$ref);
+ if ($real) {
+ push @out, $self->format_dx_spot($ref);
+ } else {
+ push @out, Spot::formatl(@$ref);
+ }
}
}
}
}