X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fshow%2Fdx.pl;h=b65f0f8275a54cbc6d0c9511aa90ecf3843d35ec;hb=0ce79a125db0acb043fceaa641d8b3a9eae71a41;hp=6908a52779efebe6429a051661da18c79499f56e;hpb=3f23d956f43f2fea226b5f58750dc406e39f7581;p=spider.git

diff --git a/cmd/show/dx.pl b/cmd/show/dx.pl
index 6908a527..b65f0f82 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,6 +29,7 @@ my $bystate;
 my $itu;
 my $byitu;
 my $fromdxcc;
+my $exact;
 my ($doqsl, $doiota, $doqra, $dofilter);
 
 while ($f = shift @list) {		# next field
@@ -40,6 +42,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;
@@ -180,6 +186,7 @@ if ($pre) {
 		} else {
 			$pre =~ s/\.\*\$$//;
 		}
+		$pre .= '$' if $exact;
 		$expr = "\$f1 =~ m{$pre}";
 		$pre =~ s/[\^\$]//g;
 		$hint = "m{\U$pre}";
@@ -375,19 +382,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 && $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);
-		}
-	}
-}
+
+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);