X-Git-Url: http://www.dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fdx.pl;h=394cb7ab6820495eaf71e72978147bdd741d9dd6;hb=b060a0a3ee72530aa3f10d453186a662b66d7efe;hp=a966ff6b01ccd56c304ea6c24e5e5df0385bd72a;hpb=171a7a0bf86e9732a33c7829e808129ec01c51c2;p=spider.git

diff --git a/cmd/dx.pl b/cmd/dx.pl
index a966ff6b..394cb7ab 100644
--- a/cmd/dx.pl
+++ b/cmd/dx.pl
@@ -14,6 +14,7 @@ my $spotter = $self->call;
 my $spotted;
 my $freq;
 my @out;
+my $valid = 0;
 
 # first lets see if we think we have a callsign as the first argument
 if ($f[0] =~ /[A-Za-z]/) {
@@ -27,15 +28,12 @@ if ($f[0] =~ /[A-Za-z]/) {
   $line =~ s/^$f[0]\s+$f[1]\s*//;
 }
 
-# check the freq, if the number is < 1800 it is in Mhz (probably)
-$freq = $freq * 1000 if $freq < 1800;
-
 # bash down the list of bands until a valid one is reached
-my $valid = 0;
 my $bandref;
 my @bb;
 my $i;
 
+# first in KHz
 L1:
 foreach $bandref (Bands::get_all()) {
   @bb = @{$bandref->band};
@@ -47,17 +45,45 @@ foreach $bandref (Bands::get_all()) {
   }
 }
 
-push @out, "Frequency $freq not in band [usage: DX freq call comments]" if !$valid;
-return (1, @out) if !$valid;
+if (!$valid) {
+
+	# try again in MHZ 
+	$freq = $freq * 1000 if $freq;
+
+L2:
+    foreach $bandref (Bands::get_all()) {
+		@bb = @{$bandref->band};
+		for ($i = 0; $i < @bb; $i += 2) {
+			if ($freq >= $bb[$i] && $freq <= $bb[$i+1]) {
+				$valid = 1;
+				last L2;
+			}
+		}
+	}
+}
 
-# send orf to the users
-my $buf = sprintf "DX de %-7.7s %13.1f %-12.12s %-30.30s %5.5s\a\a", $spotter, $freq, $spotted, $line, ztime(time);
-DXProt::broadcast_users($buf);
+
+
+push @out, $self->msg('dx1', $freq) if !$valid;
+
+# check we have a callsign :-)
+if ($spotted le ' ') {
+	push @out, $self->msg('dx2');
+	
+  $valid = 0;
+}
+
+return (1, @out) if !$valid;
 
 # Store it here
-Spot::add($freq, $spotted, time, $line, $spotter);
+if (Spot::add($freq, $spotted, $main::systime, $line, $spotter)) {
+  # send orf to the users
+  my $buf = Spot::formatb($freq, $spotted, $main::systime, $line, $spotter);
+  DXProt::broadcast_users($buf);
 
-# send it orf to the cluster (hang onto your tin helmets)!
-DXProt::broadcast_ak1a(DXProt::pc11($spotter, $freq, $spotted, $line));
+
+  # send it orf to the cluster (hang onto your tin helmets)!
+  DXProt::broadcast_ak1a(DXProt::pc11($spotter, $freq, $spotted, $line));
+}
 
 return (1, @out);