fix sh/dx <call> with sql spot logging

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

diff --git a/cmd/show/dx.pl b/cmd/show/dx.pl
index 0728c650dbd20918d580788d91f0bcd52fa9c537..171b5efd78e7fbc86471810007cad1ec0eb4ff5b 100644 (file)
--- a/cmd/show/dx.pl
+++ b/cmd/show/dx.pl
@@ -1,7 +1,7 @@
 #
 # show dx (normal)
 #
-# $Id$
+#
 #
 
 my ($self, $line) = @_;
@@ -28,8 +28,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 +43,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;
@@ -173,8 +180,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 +258,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 +332,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 +348,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])";