X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fshow%2Fdx.pl;h=b10ee7cd61260a40e7b85b0332cbcd26b07e13b6;hb=0c5379f083db3c338a848004ebe2168638c605e9;hp=f74fb99643ae4e5b78af24bb4404f7b6de6bb69f;hpb=01986d2a8a71155dd5441332e4576aa546cd2829;p=spider.git

diff --git a/cmd/show/dx.pl b/cmd/show/dx.pl
index f74fb996..b10ee7cd 100644
--- a/cmd/show/dx.pl
+++ b/cmd/show/dx.pl
@@ -32,7 +32,7 @@ while ($f = shift @list) {		# next field
 	}
 	if (lc $f eq 'on' && $list[0]) { # is it freq range?
 		#    print "yup freq\n";
-		my @r = split '/', $list[0];
+		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
@@ -65,12 +65,12 @@ while ($f = shift @list) {		# next field
 		my ($a, $b);
 #		$DB::single =1;
 		
-		if (($a, $b) = $list[0] =~ /(AF|AN|NA|SA|EU|AS|OC)-?(\d\d\d)/oi) {
+		if ($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;
+		$doiota = '\b(IOTA|(AF|AN|NA|SA|EU|AS|OC)[- ]?\d?\d\d)\b' unless $doiota;
 		next;
 	}
 	if (lc $f eq 'qra') {
@@ -121,7 +121,7 @@ if ($spotter) {
 # qsl requests
 if ($doqsl) {
 	$expr .= " && " if $expr;
-	$expr .= "\$f3 =~ m{(QSL|VIA)}io";
+	$expr .= "\$f3 =~ m{(\@|>|QSL|VIA)}io";
 }
 
 # iota requests