fix is_freq check

diff --git a/cmd/dx.pl b/cmd/dx.pl
index a4ea8464b8a807b669e58ce4d7a31429221142bb..6e14cda5caa4d36038326085fb39b1fbd3f2e297 100644 (file)
--- a/cmd/dx.pl
+++ b/cmd/dx.pl
@@ -33,10 +33,10 @@ if ($f[0] =~ /^by$/i) {
 }
 
 # get the freq and callsign either way round
-if ($f[0] =~ /[A-Za-z]/) {
+if (is_freq($f[1])) {
        $spotted = uc $f[0];
        $freq = $f[1];
-} elsif ($f[0] =~ /^[0-9\.\,]+$/) {
+} elsif (is_freq($f[0])) {
     $freq = $f[0];
        $spotted = uc $f[1];
 } else {

diff --git a/perl/DXUtil.pm b/perl/DXUtil.pm
index 2c814ea33d834cbe5001eede20eecc0755059695..9d475ed89c8f2f17713b3aabdc9aa6c79d93d4df 100644 (file)
--- a/perl/DXUtil.pm
+++ b/perl/DXUtil.pm
@@ -351,7 +351,7 @@ sub is_pcflag
 # check that a thing is a frequency
 sub is_freq
 {
-       return $_[0] =~ /^[\d\.]+$/;
+       return $_[0] =~ /^\d+(?:\.\d+)?$/;
 }
 
 # check that a thing is just digits