From: minima <minima>
Date: Tue, 22 Jun 2004 12:53:14 +0000 (+0000)
Subject: back fix spots
X-Git-Tag: R_1_51B~39
X-Git-Url: http://dxspider.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=d4b94aba599c706c4fcb61aa206b84e166e8b690;p=spider.git

back fix spots
---

diff --git a/cmd/show/dx.pl b/cmd/show/dx.pl
index 09617113..bfeabf4c 100644
--- 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 08190186..72a89807 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->{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++;