X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fshow%2Fdx.pl;h=5ebc103315b631327728378a4e217965b219ef21;hb=5378e6f269bce40d878b06e76dcf58a62858dd7b;hp=c0c43fa35c50b866a5f865aeca22dfa7109f32cf;hpb=e2ca7811e49048bfad82ec31e148a79fe9904e2b;p=spider.git

diff --git a/cmd/show/dx.pl b/cmd/show/dx.pl
index c0c43fa3..5ebc1033 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
 
+	# 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;
@@ -34,13 +44,14 @@ sub handle
 	
 	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?
+		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;
 		}
@@ -69,6 +80,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,7 +120,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) ) {
+		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  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');
@@ -132,6 +159,7 @@ sub handle
 	return (0, "sh/dx parse error '$r' " . $filter) if $r;
 
 	$user ||= '';
+	$expr ||= '';
 	dbg "sh/dx user: $user expr: $expr from: $from to: $to fromday: $fromday today: $today" if isdbg('sh/dx');
   
 	# now do the search