add cmd line to forkcall stats

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

diff --git a/cmd/show/dx.pl b/cmd/show/dx.pl
index 31809a734c7158be99dda8f73835fcb0b22beaba..1170a3447e5e333d3c1659458ecf8f04d811a33b 100644 (file)
--- a/cmd/show/dx.pl
+++ b/cmd/show/dx.pl
@@ -1,15 +1,16 @@
 #
 # 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;
@@ -28,8 +29,11 @@ my $bystate;
 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) {
@@ -40,6 +44,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;
@@ -86,7 +94,7 @@ while ($f = shift @list) {            # next field
                next;
        }
        if (lc $f =~ /^filt/) {
-               $dofilter = 1 if $self->spotsfilter;
+               $dofilter = 1 if $self && $self->spotsfilter;
                next;
        }
        if (lc $f eq 'qsl') {
@@ -173,8 +181,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 +259,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 +333,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 +349,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])";
@@ -365,19 +384,41 @@ if ($doqra) {
 #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);