X-Git-Url: http://www.dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FSpot.pm;h=3f5db145ee53c69494ee83852a46726b4f27c659;hb=4e6ea4e7991cf205a61637e16f5cf852399e7ad9;hp=08190186ed34a869d16e845926621b4b79184590;hpb=df49d2cf8efcb2b6becf241379700f363a7014df;p=spider.git

diff --git a/perl/Spot.pm b/perl/Spot.pm
index 08190186..3f5db145 100644
--- 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->{spotsfilter}) {
+                            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++;