DX 69 will act as baddx

[spider.git] / cmd / dx.pl

diff --git a/cmd/dx.pl b/cmd/dx.pl
index a966ff6b01ccd56c304ea6c24e5e5df0385bd72a..73ba0de0e4275dd74d11d4c63f06244146673786 100644 (file)
--- a/cmd/dx.pl
+++ b/cmd/dx.pl
@@ -9,55 +9,124 @@
 #
 
 my ($self, $line) = @_;
-my @f = split /\s+/, $line;
+my @f = split /\s+/, $line, 3;
 my $spotter = $self->call;
 my $spotted;
 my $freq;
 my @out;
+my $valid = 0;
+return (1, $self->msg('e5')) if $self->remotecmd;
+
+my @bad;
+if (@bad = BadWords::check($line)) {   
+       $self->badcount(($self->badcount||0) + @bad);
+       return (1, $self->msg('e17', @bad));
+}
+
+# do we have at least two args?
+return (1, $self->msg('dx2')) unless @f >= 2;
 
-# 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*//;
+# as a result of a suggestion by Steve K9AN, I am changing the syntax of
+# 'spotted by' things to "dx by g1tlh <freq> <call>" <freq> and <call>
+# can be in any order
+
+if ($f[0] =~ /^by$/i) {
+    $spotter = uc $f[1];
+    $line =~ s/^\s*$f[0]\s+$f[1]\s+//;
+       $line = $f[2];
+       @f = split /\s+/, $line;
+       return (1, $self->msg('dx2')) unless @f >= 2;
+}
+
+# get the freq and callsign either way round
+if (is_freq($f[1]) && $f[0] =~ m{^[\w\d]+(?:/[\w\d]+){0,2}$}) {
+       $spotted = uc $f[0];
+       $freq = $f[1];
+} elsif (is_freq($f[0]) && $f[1] =~ m{^[\w\d]+(?:/[\w\d]+){0,2}$}) {
+    $freq = $f[0];
+       $spotted = uc $f[1];
 } else {
-  $freq = $f[0];
-  $spotted = uc $f[1]; 
-  $line =~ s/^$f[0]\s+$f[1]\s*//;
+       return (1, $self->msg('dx3'));
 }
 
-# check the freq, if the number is < 1800 it is in Mhz (probably)
-$freq = $freq * 1000 if $freq < 1800;
+
+# make line the rest of the line
+$line = $f[2] || " ";
+@f = split /\s+/, $line;
 
 # 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;
+               }
        }
-  }
 }
 
-push @out, "Frequency $freq not in band [usage: DX freq call comments]" if !$valid;
-return (1, @out) if !$valid;
+unless ($valid) {
+
+       # try again in MHZ 
+       $freq = $freq * 1000 if $freq;
 
-# 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);
+ 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;
+                       }
+               }
+       }
+}
 
-# Store it here
-Spot::add($freq, $spotted, time, $line, $spotter);
 
-# send it orf to the cluster (hang onto your tin helmets)!
-DXProt::broadcast_ak1a(DXProt::pc11($spotter, $freq, $spotted, $line));
+push @out, $self->msg('dx1', $freq) unless $valid;
+
+# check we have a callsign :-)
+if ($spotted le ' ') {
+       push @out, $self->msg('dx2');
+       
+       $valid = 0;
+}
+
+return (1, @out) unless $valid;
+
+
+# Store it here (but only if it isn't baddx)
+if ($DXProt::baddx->in($spotted) || $freq =~ /^69/) {
+
+       # heaven forfend that we get a 69Mhz band :-)
+       if ($freq =~ /^69/) {
+               $self->badcount(($self->badcount||0) + 1);
+       }
+
+       my $buf = Spot::formatb($self->user->wantgrid, $freq, $spotted, $main::systime, $line, $spotter);
+       push @out, $buf;
+} else {
+       my $t = (int ($main::systime/60)) * 60;
+       return (1, $self->msg('dup')) if Spot::dup($freq, $spotted, $t, $line);
+       my @spot = Spot::prepare($freq, $spotted, $t, $line, $spotter, $main::mycall);
+       if (@spot) {
+               # store it 
+               Spot::add(@spot);
+
+               # send orf to the users
+               DXProt::send_dx_spot($self, DXProt::pc11($spotter, $freq, $spotted, $line), @spot);
+       }
+}
 
 return (1, @out);
+
+
+
+
+