X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fshow%2Fdx.pl;h=171b5efd78e7fbc86471810007cad1ec0eb4ff5b;hb=9b65e70322b24190bb5f677ccedcc000ab4625d2;hp=f99a2b6cf8c1a08c81bb6e5aee15e1da5e05ad61;hpb=c3505bcfc922cd712bad2c20b3479cf8d1dc54fe;p=spider.git

diff --git a/cmd/show/dx.pl b/cmd/show/dx.pl
index f99a2b6c..171b5efd 100644
--- a/cmd/show/dx.pl
+++ b/cmd/show/dx.pl
@@ -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;
@@ -175,11 +182,12 @@ if ($pre) {
 	unless (@ans) {
 		$pre .= '*' unless $pre =~ /[\*\?\[]$/o;
 		$pre = shellregex($pre);
-		if ($main::dbh) {
+		if ($usesql) {
 			$pre =~ s/\.\*/%/g;
 		} else {
 			$pre =~ s/\.\*\$$//;
 		}
+		$pre .= '$' if $exact;
 		$expr = "\$f1 =~ m{$pre}";
 		$pre =~ s/[\^\$]//g;
 		$hint = "m{\U$pre}";
@@ -250,7 +258,7 @@ if ($spotter) {
 		$expr .= ' && ' if $expr;
 		$spotter .= '*' unless $spotter =~ /[\*\?\[]/o;
 		$spotter = shellregex($spotter);
-		if ($main::dbh) {
+		if ($usesql) {
 			$spotter =~ s/\.\*/%/g;
 		} else {
 			$spotter =~ s/\.\*\$$//;
@@ -324,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])";
@@ -340,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])";