#
my ($self, $line) = @_;
-my @f = split /\s+/, $line;
+my @f = split /\s+/, $line, 3;
my $spotter = $self->call;
my $spotted;
my $freq;
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;
}
} 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;
# 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, $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);
+
+
+
+
+