#
# show dx (normal)
#
-# $Id$
+#
#
my ($self, $line) = @_;
next;
}
if (lc $f =~ /^filt/) {
- $dofilter = 1 if $self->spotsfilter;
+ $dofilter = 1 if $self && $self->spotsfilter;
next;
}
if (lc $f eq 'qsl') {
}
}
+#$DB::single = 1;
+
# first deal with the prefix
if ($pre) {
my @ans;
}
}
unless (@ans) {
- $pre .= '*' unless $pre =~ /[\*\?\[]/o;
+ $pre .= '*' unless $pre =~ /[\*\?\[]$/o;
$pre = shellregex($pre);
+ if ($main::dbh) {
+ $pre =~ s/\.\*/%/g;
+ } else {
+ $pre =~ s/\.\*\$$//;
+ }
$expr = "\$f1 =~ m{$pre}";
$pre =~ s/[\^\$]//g;
$hint = "m{\U$pre}";
# now deal with any frequencies specified
if (@freq) {
- $expr .= ($expr) ? " && (" : "(";
-# $hint .= ($hint) ? " && (" : "(";
+ $expr .= ($expr) ? ' && (' : "(";
+# $hint .= ($hint) ? ' && ' : "(";
+# $hint .= ' && ' if $hint;
my $i;
for ($i = 0; $i < @freq; $i += 2) {
$expr .= "(\$f0 >= $freq[$i] && \$f0 <= $freq[$i+1]) ||";
# any info
if ($info) {
- $expr .= " && " if $expr;
+ $expr .= ' && ' if $expr;
$info =~ s{(.)}{"\Q$1"}ge;
$expr .= "\$f3 =~ m{$info}i";
- $hint .= " && " if $hint;
+ $hint .= ' && ' if $hint;
$hint .= "m{$info}i";
}
}
}
unless (@ans) {
- $expr .= " && " if $expr;
+ $expr .= ' && ' if $expr;
$spotter .= '*' unless $spotter =~ /[\*\?\[]/o;
$spotter = shellregex($spotter);
+ if ($main::dbh) {
+ $spotter =~ s/\.\*/%/g;
+ } else {
+ $spotter =~ s/\.\*\$$//;
+ }
$expr .= "\$f4 =~ m{\U$spotter}";
- $hint .= " && " if $hint;
+ $hint .= ' && ' if $hint;
$spotter =~ s/[\^\$]//g;
$hint .= "m{\U$spotter}";
}
if ($zone) {
my @expr;
my @hint;
+ $expr .= ' && ' if $expr;
+ $hint .= ' && ' if $hint;
for (split /[:,]/, $zone) {
push @expr, "\$f9==$_";
push @hint, "m{$_}";
if ($byzone) {
my @expr;
my @hint;
+ $expr .= ' && ' if $expr;
+ $hint .= ' && ' if $hint;
for (split /[:,]/, $byzone) {
push @expr, "\$f11==$_";
push @hint, "m{$_}";
if ($itu) {
my @expr;
my @hint;
+ $expr .= ' && ' if $expr;
+ $hint .= ' && ' if $hint;
for (split /[:,]/, $itu) {
push @expr, "\$f8==$_";
push @hint, "m{$_}";
if ($byitu) {
my @expr;
my @hint;
+ $expr .= ' && ' if $expr;
+ $hint .= ' && ' if $hint;
for (split /[:,]/, $byitu) {
push @expr, "\$f10==$_";
push @hint, "m{$_}";
if ($state) {
my @expr;
my @hint;
+ $expr .= ' && ' if $expr;
+ $hint .= ' && ' if $hint;
for (split /[:,]/, $state) {
push @expr, "\$f12 eq '$_'";
push @hint, "m{$_}";
}
- $expr .= @expr > 1 ? '($f12 && (' . join(' || ', @expr) . '))' : "(\$f12 && $expr[0])";
+ if ($main::dbh) {
+ $expr .= @expr > 1 ? '(' . join(' || ', @expr) . ')' : "$expr[0]";
+ } else {
+ $expr .= @expr > 1 ? '(\$f12 && (' . join(' || ', @expr) . '))' : "(\$f12 && $expr[0])";
+ }
$hint .= @hint > 1 ? '(' . join(' || ', @hint) . ')' : $hint[0];
}
if ($bystate) {
my @expr;
my @hint;
+ $expr .= ' && ' if $expr;
+ $hint .= ' && ' if $hint;
for (split /[:,]/, $bystate) {
push @expr, "\$f13 eq '$_'";
push @hint, "m{$_}";
}
- $expr .= @expr > 1 ? '($f13 && (' . join(' || ', @expr) . '))' : "(\$f13 && $expr[0])";
+ if ($main::dbh) {
+ $expr .= @expr > 1 ? '(' . join(' || ', @expr) . ')' : "$expr[0]";
+ } else {
+ $expr .= @expr > 1 ? '(\$f13 && (' . join(' || ', @expr) . '))' : "(\$f13 && $expr[0])";
+ }
$hint .= @hint > 1 ? '(' . join(' || ', @hint) . ')' : $hint[0];
}
# qsl requests
if ($doqsl) {
- $expr .= " && " if $expr;
+ $expr .= ' && ' if $expr;
$expr .= "\$f3 =~ m{QSL|VIA}i";
- $hint .= " && " if $hint;
+ $hint .= ' && ' if $hint;
$hint .= "m{QSL|VIA}i";
}
# iota requests
if ($doiota) {
- $expr .= " && " if $expr;
+ $expr .= ' && ' if $expr;
$expr .= "\$f3 =~ m{$doiota}i";
- $hint .= " && " if $hint;
+ $hint .= ' && ' if $hint;
$hint .= "m{$doiota}i";
}
# iota requests
if ($doqra) {
- $expr .= " && " if $expr;
+ $expr .= ' && ' if $expr;
$expr .= "\$f3 =~ m{$doqra}i";
- $hint .= " && " if $hint;
+ $hint .= ' && ' if $hint;
$hint .= "m{$doqra}io";
}
my $ref;
my @dx;
foreach $ref (@res) {
- if ($real) {
- push @out, $self->format_dx_spot(@$ref);
+ if ($self && $self->ve7cc) {
+ push @out, VE7CC::dx_spot($self, @$ref);
} else {
- push @out, Spot::formatl(@$ref);
+ if ($self && $real) {
+ push @out, DXCommandmode::format_dx_spot($self, @$ref);
+ } else {
+ push @out, Spot::formatl(@$ref);
+ }
}
}