back fix spots

diff --git a/cmd/show/dx.pl b/cmd/show/dx.pl
index 0961711347d7fd14f8650deeb3531a0d0c8af627..bfeabf4c7216479b7052f3e28c068e58ff1f40df 100644 (file)
--- a/cmd/show/dx.pl
+++ b/cmd/show/dx.pl
@@ -246,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, $dofilter);
+my @res = Spot::search($expr, $fromday, $today, $from, $to, $hint, $dofilter ? $self : undef);
 my $ref;
 my @dx;
 foreach $ref (@res) {

diff --git a/perl/Spot.pm b/perl/Spot.pm
index 08190186ed34a869d16e845926621b4b79184590..72a898079617c35a7f73fabef374475b6ed895b5 100644 (file)
--- a/perl/Spot.pm
+++ b/perl/Spot.pm
@@ -194,7 +194,7 @@ sub add
 
 sub search
 {
-       my ($expr, $dayfrom, $dayto, $from, $to, $hint, $dofilter) = @_;
+       my ($expr, $dayfrom, $dayto, $from, $to, $hint, $dxchan) = @_;
        my $eval;
        my @out;
        my $ref;
@@ -233,20 +233,20 @@ sub search
                           for (\$c = \$#spots; \$c >= 0; \$c--) {
                                        \$ref = \$spots[\$c];
                                        if ($expr) {
-                           if (\$dofilter && \$self->{inspotsfilter}) {
-                            if (\@\$spot < 9) {
-                                my i\@dxcc = Prefix::cty_data(\$spot->[1]);
+                           if (\$dxchan && \$dxchan->{inspotsfilter}) {
+                            if (\@\$ref < 9) {
+                                my \@dxcc = Prefix::cty_data(\$ref->[1]);
                                 if (\@dxcc) {
                                     pop \@dxcc;
-                                    push \@\$spot, \@dxcc;
+                                    push \@\$ref, \@dxcc;
                                 }
-                                \@dxcc = Prefix::cty_data(\$spot->[4]);
+                                \@dxcc = Prefix::cty_data(\$ref->[4]);
                                 if (\@dxcc) {
                                     pop \@dxcc;
-                                    push \@\$spot, \@dxcc;
+                                    push \@\$ref, \@dxcc;
                                 }
                             }
-                                   my (\$filter, \$hops) = \$self->{inspotsfilter}->it(\@\$spot);
+                                   my (\$filter, \$hops) = \$dxchan->{inspotsfilter}->it(\@\$ref);
                                    next unless (\$filter);
                         }
                                                \$count++;