add a 'not found' message if sh/dx shows nothing

[spider.git] / cmd / show / dx.pl

diff --git a/cmd/show/dx.pl b/cmd/show/dx.pl
index 17a17d27e3e23e4fa0ec19a0aa092ddbb3699862..192d252fce49addc2c46c79bb40c95d5497a5f81 100644 (file)
--- a/cmd/show/dx.pl
+++ b/cmd/show/dx.pl
@@ -1,15 +1,17 @@
 #
 # show dx (normal)
 #
-# $Id$
 #
+#
+
+require 5.10.1;
 
 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;
@@ -27,11 +29,14 @@ my $state;
 my $bystate;
 my $itu;
 my $byitu;
-my $fromdxcc;
+my $fromdxcc = 0;
+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";
+       dbg "arg: $f list: " . join(',', @list) if isdbg('shdx');
        if (!$from && !$to) {
                ($from, $to) = $f =~ m|^(\d+)[-/](\d+)$|; # is it a from -> to count?
                next if $from && $to > $from;
@@ -40,6 +45,10 @@ 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;
@@ -49,17 +58,19 @@ while ($f = shift @list) {          # next field
                next;
        }
        if (lc $f eq 'on' && $list[0]) { # is it freq range?
-               #    print "yup freq\n";
-               if ($list[0] =~ m|^(\d+)(?:\.\d+)?[-/](\d+)(?:\.\d+)?$|) {
-                       push @freq, $1, $2;
+               dbg "freq $list[0]" if isdbg('shdx');
+               if (my ($from, $to) = $list[0] =~ m|^(\d+)(?:\.\d+)?(?:[-/](\d+)(?:\.\d+)?)?$|) {
+                       $to = $from unless defined $to;
+                       dbg "freq '$from' '$to'" if isdbg('shdx');
+                       push @freq, $from, $to;
                        shift @list;
                        next;
                } else {
                        my @r = split '/', lc $list[0];
-                       # print "r0: $r[0] r1: $r[1]\n";
+                       dbg "r0: $r[0] r1: $r[1]" if isdbg('shdx');
                        my @fr = Bands::get_freq($r[0], $r[1]);
                        if (@fr) {                      # yup, get rid of extranous param
-                               #         print "freq: ", join(',', @fr), "\n";
+                               dbg "freq: " . join(',', @fr) if isdbg('shdx');
                                push @freq, @fr;    # add these to the list
                                shift @list;
                                next;
@@ -67,26 +78,26 @@ while ($f = shift @list) {          # next field
                }
        }
        if (lc $f eq 'day' && $list[0]) {
-               #   print "got day\n";
                ($fromday, $today) = split m|[-/]|, shift(@list);
+               dbg "got day $fromday/$today" if isdbg('shdx');
                next;
        }
        if (lc $f eq 'info' && $list[0]) {
-               #   print "got info\n";
                $info = shift @list;
+               dbg "got info $info" if isdbg('shdx');
                next;
        }
        if ((lc $f eq 'spotter' || lc $f eq 'by') && $list[0]) {
-               #    print "got spotter\n";
                $spotter = uc shift @list;
                if ($list[0] && lc $list[0] eq 'dxcc') {
                        $fromdxcc = 1;
                        shift @list;
                }
+               dbg "got spotter $spotter fromdxcc $fromdxcc" if isdbg('shdx');
                next;
        }
        if (lc $f =~ /^filt/) {
-               $dofilter = 1 if $self->spotsfilter;
+               $dofilter = 1 if $self && $self->spotsfilter;
                next;
        }
        if (lc $f eq 'qsl') {
@@ -173,8 +184,14 @@ if ($pre) {
                }
        } 
        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}";
@@ -245,6 +262,11 @@ if ($spotter) {
                $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;
@@ -314,7 +336,7 @@ if ($state) {
                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])";
@@ -330,7 +352,7 @@ if ($bystate) {
                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])";
@@ -362,22 +384,45 @@ if ($doqra) {
        $hint .= "m{$doqra}io";
 }
 
-#print "expr: $expr from: $from to: $to fromday: $fromday today: $today\n";
+dbg "expr: $expr from: $from to: $to fromday: $fromday today: $today" if isdbg('shdx');
   
 # 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 && $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);
+                                                                               }
+                                                                       }
+                                                               }
+                                                               push @out, $self->msg('e3', "sh/dx", "'$line'") unless @out;
+                                                               $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);