1. Upped the version no !!!!

[spider.git] / cmd / dx.pl

diff --git a/cmd/dx.pl b/cmd/dx.pl
index fdd07bf37c39da6b739cbf5faa8225638cefdcea..6645856299290e239c3e885c3d7409aee29fe6ea 100644 (file)
--- a/cmd/dx.pl
+++ b/cmd/dx.pl
@@ -17,55 +17,78 @@ 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 = uc $f[2];
-  $line =~ s/^$f[0]\s+$f[1]\s+$f[2]\s*//;
-} else {
-  $freq = $f[0];
-  $spotted = uc $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 $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;
+               }
        }
-  }
 }
 
-push @out, "Frequency $freq not in band [usage: DX freq call comments]" 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;
+                       }
+               }
+       }
+}
+
+
+
+push @out, $self->msg('dx1', $freq) if !$valid;
 
 # check we have a callsign :-)
 if ($spotted le ' ') {
-  push @out, "Need a callsign for the spot [usage: DX freq call comments]" ;
-  $valid = 0;
+       push @out, $self->msg('dx2');
+       
+       $valid = 0;
 }
 
 return (1, @out) if !$valid;
 
+# change ^ into : for transmission
+$line =~ s/\^/:/og;
+
 # Store it here
 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 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);