#
# show dx (normal)
#
-# $Id$
+#
#
my ($self, $line) = @_;
my $itu;
my $byitu;
my $fromdxcc;
+my $exact;
my ($doqsl, $doiota, $doqra, $dofilter);
while ($f = shift @list) { # next field
($to) = $f =~ /^(\d+)$/o if !$to; # is it a to count?
next if $to;
}
+ if (lc $f eq 'exact') {
+ $exact = 1;
+ next;
+ }
if (lc $f eq 'dxcc') {
$dxcc = 1;
next;
$info = shift @list;
next;
}
- if ((lc $f eq 'spotter' || lc $f eq 'by') && $list[0]) {
+ if ((lc $f eq 'spotter' || lc $f eq 'by' || lc $f eq 'by_dxcc') && $list[0]) {
# print "got spotter\n";
$spotter = uc shift @list;
- if ($list[0] && lc $list[0] eq 'dxcc') {
+ if ($f eq 'by_dxcc') {
+ $fromdxcc = 1;
+ } elsif ($list[0] && lc $list[0] eq 'dxcc') {
$fromdxcc = 1;
shift @list;
}
next;
}
if (lc $f =~ /^filt/) {
- $dofilter = 1 if $self->spotsfilter;
+ $dofilter = 1 if $self && $self->spotsfilter;
next;
}
if (lc $f eq 'qsl') {
}
}
unless (@ans) {
- $pre .= '*' unless $pre =~ /[\*\?\[]/o;
+ $pre .= '*' unless $pre =~ /[\*\?\[]$/o;
$pre = shellregex($pre);
+ if ($main::dbh) {
+ $pre =~ s/\.\*/%/g;
+ } else {
+ $pre =~ s/\.\*\$$//;
+ }
+ $pre .= '$' if $exact;
$expr = "\$f1 =~ m{$pre}";
$pre =~ s/[\^\$]//g;
$hint = "m{\U$pre}";
$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;
$spotter =~ s/[\^\$]//g;
if ($self && $self->ve7cc) {
push @out, VE7CC::dx_spot($self, @$ref);
} else {
- if ($real) {
+ if ($self && $real) {
push @out, DXCommandmode::format_dx_spot($self, @$ref);
} else {
push @out, Spot::formatl(@$ref);