X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fshow%2Fdx.pl;h=171b5efd78e7fbc86471810007cad1ec0eb4ff5b;hb=74a756eeda9aaf5732589bea9dd75371b0cb35e0;hp=fecf16fc1dfdeebf69f62fc6555d9e6a0e525e2b;hpb=1444521e066e02651bcb1827ae0ea643b4728b44;p=spider.git

diff --git a/cmd/show/dx.pl b/cmd/show/dx.pl
index fecf16fc..171b5efd 100644
--- a/cmd/show/dx.pl
+++ b/cmd/show/dx.pl
@@ -1,7 +1,7 @@
 #
 # show dx (normal)
 #
-# $Id$
+#
 #
 
 my ($self, $line) = @_;
@@ -18,33 +18,64 @@ my $pre;
 my $spotter;
 my $info;
 my $expr;
-my $doqsl;
+my $hint;
+my $dxcc;
+my $real;
+my $zone;
+my $byzone;
+my $state;
+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) {
-		($from, $to) = $f =~ /^(\d+)-(\d+)$/o; # is it a from -> to count?
+		($from, $to) = $f =~ m|^(\d+)[-/](\d+)$|; # is it a from -> to count?
 		next if $from && $to > $from;
 	}
 	if (!$to) {
 		($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;
+	}
+	if (lc $f eq 'rt' || $f =~ /^real/i) {
+		$real = 1;
+		next;
+	}
 	if (lc $f eq 'on' && $list[0]) { # is it freq range?
 		#    print "yup freq\n";
-		my @r = split '/', $list[0];
-			# print "r0: $r[0] r1: $r[1]\n";
-		my @fr = Bands::get_freq($r[0], $r[1]);
-		if (@fr) {			# yup, get rid of extranous param
-			#	  print "freq: ", join(',', @fr), "\n";
+		if ($list[0] =~ m|^(\d+)(?:\.\d+)?[-/](\d+)(?:\.\d+)?$|) {
+			push @freq, $1, $2;
 			shift @list;
-			push @freq, @fr;    # add these to the list
 			next;
+		} else {
+			my @r = split '/', lc $list[0];
+			# print "r0: $r[0] r1: $r[1]\n";
+			my @fr = Bands::get_freq($r[0], $r[1]);
+			if (@fr) {			# yup, get rid of extranous param
+				#	  print "freq: ", join(',', @fr), "\n";
+				push @freq, @fr;    # add these to the list
+				shift @list;
+				next;
+			}
 		}
 	}
 	if (lc $f eq 'day' && $list[0]) {
 		#   print "got day\n";
-		($fromday, $today) = split '-', shift(@list);
+		($fromday, $today) = split m|[-/]|, shift(@list);
 		next;
 	}
 	if (lc $f eq 'info' && $list[0]) {
@@ -55,67 +86,316 @@ while ($f = shift @list) {		# next field
 	if ((lc $f eq 'spotter' || lc $f eq 'by') && $list[0]) {
 		#    print "got spotter\n";
 		$spotter = uc shift @list;
+		if ($list[0] && lc $list[0] eq 'dxcc') {
+			$fromdxcc = 1;
+			shift @list;
+		}
+		next;
+	}
+	if (lc $f =~ /^filt/) {
+		$dofilter = 1 if $self && $self->spotsfilter;
 		next;
 	}
 	if (lc $f eq 'qsl') {
 		$doqsl = 1;
 		next;
 	}
+	if (lc $f eq 'iota') {
+		my ($a, $b);
+#		$DB::single =1;
+		
+		if (@list && $list[0] && (($a, $b) = $list[0] =~ /(AF|AN|NA|SA|EU|AS|OC)-?(\d?\d\d)/oi)) {
+			$a = uc $a;
+			$doiota = "\\b$a\[\-\ \]\?$b\\b";
+			shift @list;
+		}
+		$doiota = '\b(IOTA|(AF|AN|NA|SA|EU|AS|OC)[- ]?\d?\d\d)\b' unless $doiota;
+		next;
+	}
+	if (lc $f eq 'qra') {
+		$doqra = uc shift @list if @list && $list[0] =~ /[A-Z][A-Z]\d\d/oi;
+		$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) {
-	$pre .= '*' unless $pre =~ /[\*\?\[]/o;
-	$pre = shellregex($pre);
-	$expr = "\$f1 =~ m{$pre}o";
-} else {
-	$expr = "1";				# match anything
+	my @ans;
+	
+	if ($dxcc) {
+		@ans = Prefix::extract($pre);	# is it a callsign/prefix?
+		
+		if (@ans) {
+
+			# first deal with the prefix
+			my $pre = shift @ans;
+			my $a;
+			my $str = "Prefix: $pre";
+			my $l = length $str;
+			my @expr;
+			my @hint;
+			
+			# build up a search string for this dxcc country/countries
+			foreach $a (@ans) {
+				my $n = $a->dxcc();
+			    push @expr, "\$f5 == $n";
+				push @hint, "m{$n}";
+				my $name = $a->name();
+				$str .= " Dxcc: $n ($name)";
+				push @out, $str;
+				$str = ' ' x $l;
+			}
+			$expr = @expr > 1 ? '(' . join(' || ', @expr) . ')' : $expr[0];
+			$hint = @hint > 1 ? '(' . join(' || ', @hint) . ')' : $hint[0];
+		}
+	} 
+	unless (@ans) {
+		$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}";
+	}
 }
   
 # now deal with any frequencies specified
 if (@freq) {
-	$expr .= ($expr) ? " && (" : "(";
+	$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{\d+\.} ||";
+#		$hint .= "1 ||";
 	}
-	chop $expr;
-	chop $expr;
+	chop $expr;	chop $expr;
+#	chop $hint;	chop $hint;
 	$expr .= ")";
+#	$hint .= ")";
 }
 
 # any info
 if ($info) {
-	$expr .= " && " if $expr;
+	$expr .= ' && ' if $expr;
 	$info =~ s{(.)}{"\Q$1"}ge;
-	$expr .= "\$f3 =~ m{$info}io";
+	$expr .= "\$f3 =~ m{$info}i";
+	$hint .= ' && ' if $hint;
+	$hint .= "m{$info}i";
 }
 
 # any spotter
 if ($spotter) {
-	$expr .= " && " if $expr;
-	$spotter = shellregex($spotter);
-	$expr .= "\$f4 =~ m{$spotter}o";
+	
+	if ($fromdxcc) {
+		@ans = Prefix::extract($spotter);	# is it a callsign/prefix?
+		
+		if (@ans) {
+
+			# first deal with the prefix
+			my $pre = shift @ans;
+			my $a;
+			$expr .= ' && ' if $expr;
+			$hint .= ' && ' if $hint;
+			my $str = "Spotter: $pre";
+			my $l = length $str;
+			my @expr;
+			my @hint;
+			
+			# build up a search string for this dxcc country/countries
+			foreach $a (@ans) {
+				my $n = $a->dxcc();
+			    push @expr, "\$f6 == $n";
+				push @hint, "m{$n}";
+				my $name = $a->name();
+				$str .= " Dxcc: $n ($name)";
+				push @out, $str;
+				$str = ' ' x $l;
+			}
+			$expr .= @expr > 1 ? '(' . join(' || ', @expr) . ')' : $expr[0];
+			$hint .= @hint > 1 ? '(' . join(' || ', @hint) . ')' : $hint[0];
+		}
+	} 
+	unless (@ans) {
+		$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;
+		$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 ($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{$_}";
+	}
+	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 .= "\$f3 =~ m{(QSL|VIA)}io";
+	$expr .= ' && ' if $expr;
+	$expr .= "\$f3 =~ m{QSL|VIA}i";
+	$hint .= ' && ' if $hint;
+	$hint .= "m{QSL|VIA}i";
+}
+
+# iota requests
+if ($doiota) {
+	$expr .= ' && ' if $expr;
+	$expr .= "\$f3 =~ m{$doiota}i";
+	$hint .= ' && ' if $hint;
+	$hint .= "m{$doiota}i";
+}
+
+# iota requests
+if ($doqra) {
+	$expr .= ' && ' if $expr;
+	$expr .= "\$f3 =~ m{$doqra}i";
+	$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);
+my @res = Spot::search($expr, $fromday, $today, $from, $to, $hint, $dofilter ? $self : undef);
 my $ref;
 my @dx;
 foreach $ref (@res) {
-	@dx = @$ref;
-	push @out, Spot::formatl(@dx);
+	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);