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

diff --git a/cmd/show/dx.pl b/cmd/show/dx.pl
index ecb5dddc..171b5efd 100644
--- 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;
@@ -86,7 +93,7 @@ while ($f = shift @list) {		# next field
 		next;
 	}
 	if (lc $f =~ /^filt/) {
-		$dofilter = 1;
+		$dofilter = 1 if $self && $self->spotsfilter;
 		next;
 	}
 	if (lc $f eq 'qsl') {
@@ -139,6 +146,8 @@ while ($f = shift @list) {		# next field
 	}
 }
 
+#$DB::single = 1;
+
 # first deal with the prefix
 if ($pre) {
 	my @ans;
@@ -171,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}";
@@ -181,8 +196,9 @@ if ($pre) {
   
 # now deal with any frequencies specified
 if (@freq) {
-	$expr .= ($expr) ? " && (" : "(";
-#	$hint .= ($hint) ? " && (" : "(";
+	$expr .= ($expr) ? ' && (' : "(";
+#	$hint .= ($hint) ? ' && ' : "(";
+#	$hint .= ' && ' if $hint;
 	my $i;
 	for ($i = 0; $i < @freq; $i += 2) {
 		$expr .= "(\$f0 >= $freq[$i] && \$f0 <= $freq[$i+1]) ||";
@@ -199,10 +215,10 @@ if (@freq) {
 
 # any info
 if ($info) {
-	$expr .= " && " if $expr;
+	$expr .= ' && ' if $expr;
 	$info =~ s{(.)}{"\Q$1"}ge;
 	$expr .= "\$f3 =~ m{$info}i";
-	$hint .= " && " if $hint;
+	$hint .= ' && ' if $hint;
 	$hint .= "m{$info}i";
 }
 
@@ -239,11 +255,16 @@ if ($spotter) {
 		}
 	} 
 	unless (@ans) {
-		$expr .= " && " if $expr;
+		$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;
+		$hint .= ' && ' if $hint;
 		$spotter =~ s/[\^\$]//g;
 		$hint .= "m{\U$spotter}";
 	}
@@ -253,6 +274,8 @@ if ($spotter) {
 if ($zone) {
 	my @expr;
 	my @hint;
+	$expr .= ' && ' if $expr;
+	$hint .= ' && ' if $hint;
 	for (split /[:,]/, $zone) {
 		push @expr, "\$f9==$_";
 		push @hint, "m{$_}";
@@ -263,6 +286,8 @@ if ($zone) {
 if ($byzone) {
 	my @expr;
 	my @hint;
+	$expr .= ' && ' if $expr;
+	$hint .= ' && ' if $hint;
 	for (split /[:,]/, $byzone) {
 		push @expr, "\$f11==$_";
 		push @hint, "m{$_}";
@@ -275,6 +300,8 @@ if ($byzone) {
 if ($itu) {
 	my @expr;
 	my @hint;
+	$expr .= ' && ' if $expr;
+	$hint .= ' && ' if $hint;
 	for (split /[:,]/, $itu) {
 		push @expr, "\$f8==$_";
 		push @hint, "m{$_}";
@@ -285,6 +312,8 @@ if ($itu) {
 if ($byitu) {
 	my @expr;
 	my @hint;
+	$expr .= ' && ' if $expr;
+	$hint .= ' && ' if $hint;
 	for (split /[:,]/, $byitu) {
 		push @expr, "\$f10==$_";
 		push @hint, "m{$_}";
@@ -297,45 +326,57 @@ if ($byitu) {
 if ($state) {
 	my @expr;
 	my @hint;
+	$expr .= ' && ' if $expr;
+	$hint .= ' && ' if $hint;
 	for (split /[:,]/, $state) {
 		push @expr, "\$f12 eq '$_'";
 		push @hint, "m{$_}";
 	}
-	$expr .= @expr > 1 ? '($f12 && (' . join(' || ', @expr) . '))' : "(\$f12 && $expr[0])";
+	if ($usesql) {
+		$expr .= @expr > 1 ? '(' . join(' || ', @expr) . ')' : "$expr[0]";
+	} else {
+		$expr .= @expr > 1 ? '(\$f12 && (' . join(' || ', @expr) . '))' : "(\$f12 && $expr[0])";
+	}
 	$hint .= @hint > 1 ? '(' . join(' || ', @hint) . ')' : $hint[0];
 }
 if ($bystate) {
 	my @expr;
 	my @hint;
+	$expr .= ' && ' if $expr;
+	$hint .= ' && ' if $hint;
 	for (split /[:,]/, $bystate) {
 		push @expr, "\$f13 eq '$_'";
 		push @hint, "m{$_}";
 	}
-	$expr .= @expr > 1 ? '($f13 && (' . join(' || ', @expr) . '))' : "(\$f13 && $expr[0])";
+	if ($usesql) {
+		$expr .= @expr > 1 ? '(' . join(' || ', @expr) . ')' : "$expr[0]";
+	} else {
+		$expr .= @expr > 1 ? '(\$f13 && (' . join(' || ', @expr) . '))' : "(\$f13 && $expr[0])";
+	}
 	$hint .= @hint > 1 ? '(' . join(' || ', @hint) . ')' : $hint[0];
 }
 
 # qsl requests
 if ($doqsl) {
-	$expr .= " && " if $expr;
+	$expr .= ' && ' if $expr;
 	$expr .= "\$f3 =~ m{QSL|VIA}i";
-	$hint .= " && " if $hint;
+	$hint .= ' && ' if $hint;
 	$hint .= "m{QSL|VIA}i";
 }
 
 # iota requests
 if ($doiota) {
-	$expr .= " && " if $expr;
+	$expr .= ' && ' if $expr;
 	$expr .= "\$f3 =~ m{$doiota}i";
-	$hint .= " && " if $hint;
+	$hint .= ' && ' if $hint;
 	$hint .= "m{$doiota}i";
 }
 
 # iota requests
 if ($doqra) {
-	$expr .= " && " if $expr;
+	$expr .= ' && ' if $expr;
 	$expr .= "\$f3 =~ m{$doqra}i";
-	$hint .= " && " if $hint;
+	$hint .= ' && ' if $hint;
 	$hint .= "m{$doqra}io";
 }
 
@@ -346,10 +387,14 @@ my @res = Spot::search($expr, $fromday, $today, $from, $to, $hint, $dofilter ? $
 my $ref;
 my @dx;
 foreach $ref (@res) {
-	if ($real) {
-		push @out, $self->format_dx_spot(@$ref);
+	if ($self && $self->ve7cc) {
+		push @out, VE7CC::dx_spot($self, @$ref);
 	} else {
-		push @out, Spot::formatl(@$ref);
+		if ($self && $real) {
+			push @out, DXCommandmode::format_dx_spot($self, @$ref);
+		} else {
+			push @out, Spot::formatl(@$ref);
+		}
 	}
 }