X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fshow%2Fdx.pl;h=5387b7f407657ee5591711a0ae6a040abc5bf04b;hb=2733a992ac8c3d315c110a2cc1984ea0a5e5d0ff;hp=c9d85c4bef562da88c0de932a8dc5136b56cf712;hpb=0bd7ac4e24ce9e81232545b69ce8b98db605984b;p=spider.git

diff --git a/cmd/show/dx.pl b/cmd/show/dx.pl
index c9d85c4b..5387b7f4 100644
--- a/cmd/show/dx.pl
+++ b/cmd/show/dx.pl
@@ -11,10 +11,20 @@ sub handle
 {
 	my ($self, $line) = @_;
 
+	# disguise regexes
+	$line =~ s/\{(.*?)\}/'{'. unpack('H*', $1) . '}'/eg;
+	dbg("sh/dx disguise any regex: '$line'") if isdbg('sh/dx');
+
+	# now space out brackets and !
 	$line =~ s/([\(\!\)])/ $1 /g;
 	
-	my @list = split /[\s]+/, $line; # split the line up
+	my @list = split /\s+/, $line; # split the line up
+
+	# put back the regexes 
+	@list = map { my $l = $_; $l =~ s/\{([0-9a-fA-F]+)\}/'{' . pack('H*', $1) . '}'/eg; $l } @list;
 
+	dbg("sh/dx after regex return: '" . join(' ', @list) . "'") if isdbg('sh/dx');
+	
 	my @out;
 	my $f;
 	my $call = $self->call;
@@ -30,23 +40,25 @@ sub handle
 	my @flist;
 
 	
-	dbg("sh/dx \@list: " . join(" ", @list)) if isdbg('sh/dx');
+	dbg("sh/dx list: " . join(" ", @list)) if isdbg('sh/dx');
 	
-	while ($f = shift @list) {	# next field
-		dbg "sh/dx arg: $f list: " . join(',', @list) if isdbg('sh/dx');
-		if (!$from && !$to) {
-			($from, $to) = $f =~ m|^(\d+)[-/](\d+)$|; # is it a from -> to count?
+	while (@list) {	# next field
+		$f = shift @list;
+		dbg("sh/dx arg: $f list: '" . join(',', @list) . "'") if isdbg('sh/dx');
+		if ($f && !$from && !$to) {
+			($from, $to) = $f =~ m|^(\d+)[-/](\d+)$| || (0,0); # is it a from -> to count?
 			dbg("sh/dx from: $from to: $to") if isdbg('sh/dx');
 			next if $from && $to > $from;
 		}
-		if (!$to) {
+		if ($f && !$to) {
 			($to) = $f =~ /^(\d+)$/o if !$to; # is it a to count?
+			$to ||= 0;
 			dbg("sh/dx to: $to") if isdbg('sh/dx');
 			next if $to;
 		}
 		if (lc $f eq 'day' && $list[0]) {
 			($fromday, $today) = split m|[-/]|, shift(@list);
-			dbg "sh/dx got day $fromday/$today" if isdbg('sh/dx');
+			dbg("sh/dx got day $fromday/$today") if isdbg('sh/dx');
 			next;
 		}
 		if (lc $f eq 'exact') {
@@ -69,6 +81,22 @@ sub handle
 			push @flist, "info {QSL|VIA}";
 			next;
 		}
+		if (lc $f eq '<es>') {
+			dbg("sh/dx <es>") if isdbg('sh/dx');
+			push @flist, "info {<ES>}";
+			next;
+		}
+		if (lc $f eq '<tr>') {
+			dbg("sh/dx <es>") if isdbg('sh/dx');
+			push @flist, "info {<TR>}";
+			next;
+		}
+		if (lc $f eq '<ms>') {
+			dbg("sh/dx <ms>") if isdbg('sh/dx');
+			push @flist, "info {<ms>}";
+			next;
+		}
+
 		if (lc $f eq 'iota') {
 			my $doiota;
 			if (@list && $list[0] && (($a, $b) = $list[0] =~ /(AF|AN|NA|SA|EU|AS|OC)[-\s]?(\d\d?\d?)/i)) {
@@ -93,8 +121,7 @@ sub handle
 			dbg("sh/dx operator $f") if isdbg('sh/dx');
 			next;
 		}
-		if (grep {lc $f eq $_} qw(on freq call info spotter by call_dxcc by_dxcc bydxcc origin call_itu itu call_zone zone  byitu by_itu by_zone byzone call_state state bystate by_state ip) ) {
-			$f =~ s/^by(\w)/by_$1/;
+		if (grep {lc $f eq $_} qw(on freq call info spotter by dxcc call_dxcc by_dxcc bydxcc origin call_itu itu call_zone zone cq bycq  byitu by_itu by_zone byzone call_state state bystate by_state ip) ) {
 			push @flist, $f;
 			push @flist, shift @list if @list;
 			dbg("sh/dx function $flist[-2] $flist[-1]") if isdbg('sh/dx');
@@ -107,6 +134,7 @@ sub handle
 		push @flist, $f;
 	}
 
+	dbg("sh/dx: flist = '" . join(',', @flist). "'") if isdbg('sh/dx');
 	
 	if ($pre) {
 		# someone (probably me) has forgotten the 'info' keyword
@@ -127,13 +155,14 @@ sub handle
 	}
 	
     my $newline = join(' ', @flist);
-	dbg("sh/dx newline: $newline") if isdbg('sh/dx');
+	dbg("sh/dx newline: '$newline'") if isdbg('sh/dx');
 	my ($r, $filter, $fno, $user, $expr) = $Spot::filterdef->parse($self, 'spots', $newline, 1);
 
 	return (0, "sh/dx parse error '$r' " . $filter) if $r;
 
 	$user ||= '';
-	dbg "sh/dx user: $user expr: $expr from: $from to: $to fromday: $fromday today: $today" if isdbg('sh/dx');
+	$expr ||= '';
+	dbg("sh/dx user: $user expr: $expr from: $from to: $to fromday: $fromday today: $today") if isdbg('sh/dx');
   
 	# now do the search