put duplicate checking into respective modules and out of DXProt.

[spider.git] / cmd / dx.pl

diff --git a/cmd/dx.pl b/cmd/dx.pl
index 0ebfb1674cf17564919eea7f243e8e259ba62315..5e9eec1ccf6e78a12a358b46eb11b7c51ff200f7 100644 (file)
--- a/cmd/dx.pl
+++ b/cmd/dx.pl
@@ -9,7 +9,7 @@
 #
 
 my ($self, $line) = @_;
-my @f = split /\s+/, $line;
+my @f = split /\s+/, $line, 3;
 my $spotter = $self->call;
 my $spotted;
 my $freq;
@@ -26,8 +26,8 @@ return (1, $self->msg('dx2')) unless @f >= 2;
 if ($f[0] =~ /^by$/i) {
     $spotter = uc $f[1];
     $line =~ s/^\s*$f[0]\s+$f[1]\s+//;
-    shift @f;
-       shift @f;
+       $line = $f[2];
+       @f = split /\s+/, $line;
        return (1, $self->msg('dx2')) unless @f >= 2;
 }
 
@@ -41,7 +41,10 @@ if ($f[0] =~ /[A-Za-z]/) {
 } else {
        return (1, $self->msg('dx2'));
 }
-$line =~ s/^$f[0]\s+$f[1]\s*//;
+
+# 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 $bandref;
@@ -97,17 +100,17 @@ if (grep $_ eq $spotted, @DXProt::baddx) {
        my $buf = Spot::formatb($freq, $spotted, $main::systime, $line, $spotter);
        push @out, $buf;
 } else {
+       return (1, $self->msg('dup')) if Spot::dup($freq, $spotted, $main::systime, $line);
        my @spot = Spot::add($freq, $spotted, $main::systime, $line, $spotter, $main::mycall);
        if (@spot) {
                # send orf to the users
                DXProt::send_dx_spot($self, DXProt::pc11($spotter, $freq, $spotted, $line), @spot);
-               
-#              my $buf = Spot::formatb($freq, $spotted, $main::systime, $line, $spotter);
-#              DXProt::broadcast_users("$buf\a\a", 'dx', $spot[0]);
-
-               # send it orf to the cluster (hang onto your tin helmets) 
-#              DXProt::broadcast_all_ak1a(DXProt::pc11($spotter, $freq, $spotted, $line), $DXProt::me);
        }
 }
 
 return (1, @out);
+
+
+
+
+