make the time stored on dups generated locally on spots an integer no of

[spider.git] / cmd / dx.pl

diff --git a/cmd/dx.pl b/cmd/dx.pl
index 98338ec60986b731439d610605fe82e58f0368c1..2ea40672ad044dbb8b3e7a468b0d4090f9516a5e 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;
@@ -94,9 +97,10 @@ $line =~ s/\^/:/og;
 
 # Store it here (but only if it isn't baddx)
 if (grep $_ eq $spotted, @DXProt::baddx) {
-       my $buf = Spot::formatb($freq, $spotted, $main::systime, $line, $spotter);
+       my $buf = Spot::formatb($self->user->wantgrid, $freq, $spotted, $main::systime, $line, $spotter);
        push @out, $buf;
 } else {
+       return (1, $self->msg('dup')) if Spot::dup($freq, $spotted, (int ($main::systime/60)) * 60, $line);
        my @spot = Spot::add($freq, $spotted, $main::systime, $line, $spotter, $main::mycall);
        if (@spot) {
                # send orf to the users
@@ -105,3 +109,8 @@ if (grep $_ eq $spotted, @DXProt::baddx) {
 }
 
 return (1, @out);
+
+
+
+
+