X-Git-Url: http://www.dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fshow%2Fdx.pl;h=31809a734c7158be99dda8f73835fcb0b22beaba;hb=f19175c9555c23648a8da601555aa2d918850a97;hp=57271e8f874a192713ee5e1ac5a1c731d3b50be2;hpb=290cd395e4bac4a92dfc3c40a2a3fd7de93110eb;p=spider.git

diff --git a/cmd/show/dx.pl b/cmd/show/dx.pl
index 57271e8f..31809a73 100644
--- a/cmd/show/dx.pl
+++ b/cmd/show/dx.pl
@@ -21,8 +21,14 @@ my $expr;
 my $hint;
 my $dxcc;
 my $real;
+my $zone;
+my $byzone;
+my $state;
+my $bystate;
+my $itu;
+my $byitu;
 my $fromdxcc;
-my ($doqsl, $doiota, $doqra);
+my ($doqsl, $doiota, $doqra, $dofilter);
 
 while ($f = shift @list) {		# next field
 	#  print "f: $f list: ", join(',', @list), "\n";
@@ -79,6 +85,10 @@ while ($f = shift @list) {		# next field
 		}
 		next;
 	}
+	if (lc $f =~ /^filt/) {
+		$dofilter = 1 if $self->spotsfilter;
+		next;
+	}
 	if (lc $f eq 'qsl') {
 		$doqsl = 1;
 		next;
@@ -100,11 +110,37 @@ while ($f = shift @list) {		# next field
 		$doqra = '\b([A-Z][A-Z]\d\d|[A-Z][A-Z]\d\d[A-Z][A-Z])\b' unless $doqra;
 		next;
 	}
+	if (lc $f eq 'zone') {
+		$zone = shift @list if @list;
+		next;
+	}
+	if (lc $f =~ /^by_?zone/) {
+		$byzone = shift @list if @list;
+		next;
+	}
+	if (lc $f eq 'itu') {
+		$itu = shift @list if @list;
+		next;
+	}
+	if (lc $f =~ /^by_?itu/) {
+		$byitu = shift @list if @list;
+		next;
+	}
+	if (lc $f eq 'state') {
+		$state = uc shift @list if @list;
+		next;
+	}
+	if (lc $f =~ /^by_?state/) {
+		$bystate = uc shift @list if @list;
+		next;
+	}
 	if (!$pre) {
 		$pre = uc $f;
 	}
 }
 
+#$DB::single = 1;
+
 # first deal with the prefix
 if ($pre) {
 	my @ans;
@@ -147,26 +183,29 @@ 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]) ||";
 		my $r = Spot::ftor($freq[$i], $freq[$i+1]);
-		$hint .= "m{$r\\.} ||" if $r;
+#		$hint .= "m{$r\\.} ||" if $r;
+#		$hint .= "m{\d+\.} ||";
+#		$hint .= "1 ||";
 	}
 	chop $expr;	chop $expr;
-	chop $hint;	chop $hint;
+#	chop $hint;	chop $hint;
 	$expr .= ")";
-	$hint .= ")";
+#	$hint .= ")";
 }
 
 # 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";
 }
 
@@ -203,51 +242,141 @@ if ($spotter) {
 		}
 	} 
 	unless (@ans) {
-		$expr .= " && " if $expr;
+		$expr .= ' && ' if $expr;
 		$spotter .= '*' unless $spotter =~ /[\*\?\[]/o;
 		$spotter = shellregex($spotter);
 		$expr .= "\$f4 =~ m{\U$spotter}";
-		$hint .= " && " if $hint;
+		$hint .= ' && ' if $hint;
 		$spotter =~ s/[\^\$]//g;
 		$hint .= "m{\U$spotter}";
 	}
 }
 
+# zone requests
+if ($zone) {
+	my @expr;
+	my @hint;
+	$expr .= ' && ' if $expr;
+	$hint .= ' && ' if $hint;
+	for (split /[:,]/, $zone) {
+		push @expr, "\$f9==$_";
+		push @hint, "m{$_}";
+	}
+	$expr .= @expr > 1 ? '(' . join(' || ', @expr) . ')' : $expr[0];
+	$hint .= @hint > 1 ? '(' . join(' || ', @hint) . ')' : $hint[0];
+}
+if ($byzone) {
+	my @expr;
+	my @hint;
+	$expr .= ' && ' if $expr;
+	$hint .= ' && ' if $hint;
+	for (split /[:,]/, $byzone) {
+		push @expr, "\$f11==$_";
+		push @hint, "m{$_}";
+	}
+	$expr .= @expr > 1 ? '(' . join(' || ', @expr) . ')' : $expr[0];
+	$hint .= @hint > 1 ? '(' . join(' || ', @hint) . ')' : $hint[0];
+}
+
+# itu requests
+if ($itu) {
+	my @expr;
+	my @hint;
+	$expr .= ' && ' if $expr;
+	$hint .= ' && ' if $hint;
+	for (split /[:,]/, $itu) {
+		push @expr, "\$f8==$_";
+		push @hint, "m{$_}";
+	}
+	$expr .= @expr > 1 ? '(' . join(' || ', @expr) . ')' : $expr[0];
+	$hint .= @hint > 1 ? '(' . join(' || ', @hint) . ')' : $hint[0];
+}
+if ($byitu) {
+	my @expr;
+	my @hint;
+	$expr .= ' && ' if $expr;
+	$hint .= ' && ' if $hint;
+	for (split /[:,]/, $byitu) {
+		push @expr, "\$f10==$_";
+		push @hint, "m{$_}";
+	}
+	$expr .= @expr > 1 ? '(' . join(' || ', @expr) . ')' : $expr[0];
+	$hint .= @hint > 1 ? '(' . join(' || ', @hint) . ')' : $hint[0];
+}
+
+# state requests
+if ($state) {
+	my @expr;
+	my @hint;
+	$expr .= ' && ' if $expr;
+	$hint .= ' && ' if $hint;
+	for (split /[:,]/, $state) {
+		push @expr, "\$f12 eq '$_'";
+		push @hint, "m{$_}";
+	}
+	if ($main::dbh) {
+		$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{$_}";
+	}
+	if ($main::dbh) {
+		$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);
+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);
+	if ($self->ve7cc) {
+		push @out, VE7CC::dx_spot($self, @$ref);
 	} else {
-		push @out, Spot::formatl(@$ref);
+		if ($real) {
+			push @out, DXCommandmode::format_dx_spot($self, @$ref);
+		} else {
+			push @out, Spot::formatl(@$ref);
+		}
 	}
 }