X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fdx.pl;h=c946d76107b6a70f46ff0bcae4506888711ebe52;hb=fe78618f23392a6ae58542b78cc4c8dbc84e71c5;hp=98338ec60986b731439d610605fe82e58f0368c1;hpb=bbe9659ae19097772164125b4fc97040a4e76350;p=spider.git diff --git a/cmd/dx.pl b/cmd/dx.pl index 98338ec6..c946d761 100644 --- 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;