back fix spots

This commit is contained in:
minima 2004-06-22 12:53:14 +00:00
parent df49d2cf8e
commit d4b94aba59
2 changed files with 9 additions and 9 deletions

View File

@ -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) {

View File

@ -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++;