back fix spots

[spider.git] / cmd / show / dx.pl

diff --git a/cmd/show/dx.pl b/cmd/show/dx.pl
index 57271e8f874a192713ee5e1ac5a1c731d3b50be2..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 ($doqsl, $doiota, $doqra);
+my ($doqsl, $doiota, $doqra, $dofilter);
 
 while ($f = shift @list) {             # next field
        #  print "f: $f list: ", join(',', @list), "\n";
@@ -79,6 +79,10 @@ while ($f = shift @list) {           # next field
                }
                next;
        }
+       if (lc $f =~ /^filt/) {
+               $dofilter = 1;
+               next;
+       }
        if (lc $f eq 'qsl') {
                $doqsl = 1;
                next;
@@ -153,7 +157,9 @@ if (@freq) {
        for ($i = 0; $i < @freq; $i += 2) {
                $expr .= "(\$f0 >= $freq[$i] && \$f0 <= $freq[$i+1]) ||";
                my $r = Spot::ftor($freq[$i], $freq[$i+1]);
-               $hint .= "m{$r\\.} ||" if $r;
+#              $hint .= "m{$r\\.} ||" if $r;
+#              $hint .= "m{\d+\.} ||";
+               $hint .= "1 ||";
        }
        chop $expr;     chop $expr;
        chop $hint;     chop $hint;
@@ -240,7 +246,7 @@ if ($doqra) {
 #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) {