projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
back fix spots
[spider.git]
/
cmd
/
show
/
dx.pl
diff --git
a/cmd/show/dx.pl
b/cmd/show/dx.pl
index c3806f8795f801f73551384fc69c44c457ffc172..bfeabf4c7216479b7052f3e28c068e58ff1f40df 100644
(file)
--- a/
cmd/show/dx.pl
+++ b/
cmd/show/dx.pl
@@
-22,7
+22,7
@@
my $hint;
my $dxcc;
my $real;
my $fromdxcc;
my $dxcc;
my $real;
my $fromdxcc;
-my ($doqsl, $doiota, $doqra);
+my ($doqsl, $doiota, $doqra
, $dofilter
);
while ($f = shift @list) { # next field
# print "f: $f list: ", join(',', @list), "\n";
while ($f = shift @list) { # next field
# print "f: $f list: ", join(',', @list), "\n";
@@
-79,6
+79,10
@@
while ($f = shift @list) { # next field
}
next;
}
}
next;
}
+ if (lc $f =~ /^filt/) {
+ $dofilter = 1;
+ next;
+ }
if (lc $f eq 'qsl') {
$doqsl = 1;
next;
if (lc $f eq 'qsl') {
$doqsl = 1;
next;
@@
-154,7
+158,8
@@
if (@freq) {
$expr .= "(\$f0 >= $freq[$i] && \$f0 <= $freq[$i+1]) ||";
my $r = Spot::ftor($freq[$i], $freq[$i+1]);
# $hint .= "m{$r\\.} ||" if $r;
$expr .= "(\$f0 >= $freq[$i] && \$f0 <= $freq[$i+1]) ||";
my $r = Spot::ftor($freq[$i], $freq[$i+1]);
# $hint .= "m{$r\\.} ||" if $r;
- $hint .= "m{\d+\.} ||";
+# $hint .= "m{\d+\.} ||";
+ $hint .= "1 ||";
}
chop $expr; chop $expr;
chop $hint; chop $hint;
}
chop $expr; chop $expr;
chop $hint; chop $hint;
@@
-241,7
+246,7
@@
if ($doqra) {
#print "expr: $expr from: $from to: $to fromday: $fromday today: $today\n";
# now do the search
#print "expr: $expr from: $from to: $to fromday: $fromday today: $today\n";
# now do the search
-my @res = Spot::search($expr, $fromday, $today, $from, $to, $hint);
+my @res = Spot::search($expr, $fromday, $today, $from, $to, $hint
, $dofilter ? $self : undef
);
my $ref;
my @dx;
foreach $ref (@res) {
my $ref;
my @dx;
foreach $ref (@res) {