1. Upped the version no !!!!

[spider.git] / cmd / dx.pl

diff --git a/cmd/dx.pl b/cmd/dx.pl
index cbf003c0d825cd5762ca3755625fe397af4aad34..6645856299290e239c3e885c3d7409aee29fe6ea 100644 (file)
--- a/cmd/dx.pl
+++ b/cmd/dx.pl
@@ -14,50 +14,81 @@ 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]/) {
-  $spotter = uc $f[0];
-  $freq = $f[1];
-  $spotted = $f[2];
-  $line =~ s/^$f[0]\s+$freq\s+$spotted\s*//;
-} else {
-  $freq = $f[0];
-  $spotted = $f[1]; 
-  $line =~ s/^$f[0]\s+$f[1]\s*//;
+if (defined @f && @f >= 3 && $f[0] =~ /[A-Za-z]/) {
+       $spotter = uc $f[0];
+       $freq = $f[1];
+       $spotted = uc $f[2];
+       $line =~ s/^$f[0]\s+$f[1]\s+$f[2]\s*//;
+} elsif (defined @f && @f >= 2) {
+       $freq = $f[0];
+       $spotted = uc $f[1]; 
+       $line =~ s/^$f[0]\s+$f[1]\s*//;
+} elsif (!defined @f || @f < 2) {
+       return (1, $self->msg('dx2'));
 }
 
-# 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};
-  for ($i = 0; $i < @bb; $i += 2) {
-    if ($freq >= $bb[$i] && $freq <= $bb[$i+1]) {
-         $valid = 1;
-         last L1;
+       @bb = @{$bandref->band};
+       for ($i = 0; $i < @bb; $i += 2) {
+               if ($freq >= $bb[$i] && $freq <= $bb[$i+1]) {
+                       $valid = 1;
+                       last L1;
+               }
+       }
+}
+
+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;
+                       }
+               }
        }
-  }
 }
 
-push @out, "Frequency $freq not in band [usage: DX freq call comments]" if !$valid;
+
+
+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;
 
-# 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);
+# change ^ into : for transmission
+$line =~ s/\^/:/og;
 
 # 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);