From: Dirk Koopman <djk@tobit.co.uk>
Date: Mon, 2 Jan 2012 18:06:40 +0000 (+0000)
Subject: add by_dxcc to sh/dx
X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=commitdiff_plain;h=07c53835c49bb6eaa0523fba7e45686fd50925c2;p=spider.git

add by_dxcc to sh/dx
---

diff --git a/cmd/Commands_en.hlp b/cmd/Commands_en.hlp
index 8d8ba775..5fbbd719 100644
--- a/cmd/Commands_en.hlp
+++ b/cmd/Commands_en.hlp
@@ -2111,6 +2111,9 @@ any order to the basic SHOW/DX command, they are:-
                   
                    You can also use this with the 'by' keyword so 
                    eg by W dxcc  
+
+ by_dxcc         - alternatively you can simply say 'by_dxcc W' instead
+                   instead of 'by W dxcc'.
  
  real or rt      - Format the output the same as for real time spots. The
                    formats are deliberately different (so you can tell
diff --git a/cmd/show/dx.pl b/cmd/show/dx.pl
index f2629bff..f359aec0 100644
--- a/cmd/show/dx.pl
+++ b/cmd/show/dx.pl
@@ -81,10 +81,12 @@ while ($f = shift @list) {		# next field
 		$info = shift @list;
 		next;
 	}
-	if ((lc $f eq 'spotter' || lc $f eq 'by') && $list[0]) {
+	if ((lc $f eq 'spotter' || lc $f eq 'by' || lc $f eq 'by_dxcc') && $list[0]) {
 		#    print "got spotter\n";
 		$spotter = uc shift @list;
-		if ($list[0] && lc $list[0] eq 'dxcc') {
+		if ($f eq 'by_dxcc') {
+			$fromdxcc = 1;
+		} elsif ($list[0] && lc $list[0] eq 'dxcc') {
 			$fromdxcc = 1;
 			shift @list;
 		}