projects
/
spider.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
df49d2c
)
back fix spots
author
minima
<minima>
Tue, 22 Jun 2004 12:53:14 +0000
(12:53 +0000)
committer
minima
<minima>
Tue, 22 Jun 2004 12:53:14 +0000
(12:53 +0000)
cmd/show/dx.pl
patch
|
blob
|
history
perl/Spot.pm
patch
|
blob
|
history
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
#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) {
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
{
sub search
{
- my ($expr, $dayfrom, $dayto, $from, $to, $hint, $d
ofilter
) = @_;
+ my ($expr, $dayfrom, $dayto, $from, $to, $hint, $d
xchan
) = @_;
my $eval;
my @out;
my $ref;
my $eval;
my @out;
my $ref;
@@
-233,20
+233,20
@@
sub search
for (\$c = \$#spots; \$c >= 0; \$c--) {
\$ref = \$spots[\$c];
if ($expr) {
for (\$c = \$#spots; \$c >= 0; \$c--) {
\$ref = \$spots[\$c];
if ($expr) {
- if (\$d
ofilter && \$self
->{inspotsfilter}) {
- if (\@\$
spot
< 9) {
- my
i\@dxcc = Prefix::cty_data(\$spot
->[1]);
+ if (\$d
xchan && \$dxchan
->{inspotsfilter}) {
+ if (\@\$
ref
< 9) {
+ my
\@dxcc = Prefix::cty_data(\$ref
->[1]);
if (\@dxcc) {
pop \@dxcc;
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;
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++;
next unless (\$filter);
}
\$count++;