X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fshow%2Fdx.pl;h=15eaffd0d5a434feb986827389f838552dbab50e;hb=36e0c1ffda9295a4090eab75360f1b59d964ada3;hp=daf77a3d87dd0a7a3f13113f78185048db17ed19;hpb=d90ff9fe9682961939e823a0a0cf171e208be58b;p=spider.git

diff --git a/cmd/show/dx.pl b/cmd/show/dx.pl
index daf77a3d..15eaffd0 100644
--- 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->{spotfilter};
+		$dofilter = 1 if $self && $self->spotsfilter;
 		next;
 	}
 	if (lc $f eq 'qsl') {
@@ -139,6 +147,8 @@ while ($f = shift @list) {		# next field
 	}
 }
 
+#$DB::single = 1;
+
 # first deal with the prefix
 if ($pre) {
 	my @ans;
@@ -171,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}";
@@ -181,8 +197,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 +216,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 +256,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 +275,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 +287,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 +301,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 +313,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,60 +327,98 @@ 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";
 }
 
 #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 ($real) {
-		push @out, $self->format_dx_spot(@$ref);
-	} else {
-		push @out, Spot::formatl(@$ref);
-	}
-}
+
+push @out, $self->spawn_cmd(\&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);