#
# show dx (normal)
#
-# $Id$
#
+#
+
my ($self, $line) = @_;
my @list = split /\s+/, $line; # split the line up
my @out;
my $f;
-my $call;
+my $call = $self->call;
my ($from, $to);
my ($fromday, $today);
my @freq;
my $itu;
my $byitu;
my $fromdxcc;
+my $exact;
my ($doqsl, $doiota, $doqra, $dofilter);
+my $usesql = $main::dbh && $Spot::use_db_for_search;
+
while ($f = shift @list) { # next field
# print "f: $f list: ", join(',', @list), "\n";
if (!$from && !$to) {
($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;
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 ($usesql) {
+ $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 ($usesql) {
+ $spotter =~ s/\.\*/%/g;
+ } else {
+ $spotter =~ s/\.\*\$$//;
+ }
$expr .= "\$f4 =~ m{\U$spotter}";
$hint .= ' && ' if $hint;
$spotter =~ s/[\^\$]//g;
push @expr, "\$f12 eq '$_'";
push @hint, "m{$_}";
}
- if ($main::dbh) {
+ if ($usesql) {
$expr .= @expr > 1 ? '(' . join(' || ', @expr) . ')' : "$expr[0]";
} else {
$expr .= @expr > 1 ? '(\$f12 && (' . join(' || ', @expr) . '))' : "(\$f12 && $expr[0])";
push @expr, "\$f13 eq '$_'";
push @hint, "m{$_}";
}
- if ($main::dbh) {
+ if ($usesql) {
$expr .= @expr > 1 ? '(' . join(' || ', @expr) . ')' : "$expr[0]";
} else {
$expr .= @expr > 1 ? '(\$f13 && (' . join(' || ', @expr) . '))' : "(\$f13 && $expr[0])";
#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 ? $self : undef);
-my $ref;
-my @dx;
-foreach $ref (@res) {
- if ($self->ve7cc) {
- push @out, VE7CC::dx_spot($self, @$ref);
- } else {
- if ($real) {
- push @out, DXCommandmode::format_dx_spot($self, @$ref);
- } else {
- push @out, Spot::formatl(@$ref);
- }
- }
-}
+
+push @out, $self->spawn_cmd("sh/dx $line", \&Spot::search,
+ args => [$expr, $fromday, $today, $from, $to, $hint, $dofilter ? $self : undef],
+ cb => sub {
+ my ($dxchan, @res) = @_;
+ my $ref;
+ my @out;
+
+ foreach $ref (@res) {
+ if ($self->ve7cc) {
+ push @out, VE7CC::dx_spot($self, @$ref);
+ } else {
+ if ($real) {
+ push @out, DXCommandmode::format_dx_spot($self, @$ref);
+ } else {
+ push @out, Spot::formatl(@$ref);
+ }
+ }
+ }
+ $dxchan->send(@out);
+ });
+
+#my @res = Spot::search($expr, $fromday, $today, $from, $to, $hint, $dofilter ? $self : undef);
+#my $ref;
+#my @dx;
+#foreach $ref (@res) {
+# if ($self && $self->ve7cc) {
+# push @out, VE7CC::dx_spot($self, @$ref);
+# } else {
+# if ($self && $real) {
+# push @out, DXCommandmode::format_dx_spot($self, @$ref);
+# } else {
+# push @out, Spot::formatl(@$ref);
+# }
+# }
+#}
return (1, @out);