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

diff --git a/cmd/show/dx.pl b/cmd/show/dx.pl
index c9d85c4b..6a9a3829 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,13 @@ 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) {
-			($to) = $f =~ /^(\d+)$/o if !$to; # is it a to count?
+		if ($f && !$to) {
+			($to) = $f =~ /^(\d+)$/o || 0 if !$to; # is it a to count?
 			dbg("sh/dx to: $to") if isdbg('sh/dx');
 			next if $to;
 		}
@@ -94,7 +104,6 @@ sub handle
 			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/;
 			push @flist, $f;
 			push @flist, shift @list if @list;
 			dbg("sh/dx function $flist[-2] $flist[-1]") if isdbg('sh/dx');