X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fwwv.pl;h=9ff5cb5808682c74e528b672862e5cbebbbb8b01;hb=6a370213479b325afe724d59c180de65d9f9af7c;hp=9f4350a6a42ba1c21fdba7303adc7ae7d8b60a35;hpb=d7e744bdddf1217675118d1185a1e6070b8ff2b7;p=spider.git diff --git a/cmd/wwv.pl b/cmd/wwv.pl index 9f4350a6..9ff5cb58 100644 --- a/cmd/wwv.pl +++ b/cmd/wwv.pl @@ -36,17 +36,18 @@ my @out; my $hour = (gmtime $main::systime)[2]; my $d = int ($main::systime / 3600) * 3600 + 18 * 60; +$line = unpad($line); + my @l = split /\s*,\s*/, $line; my $forecast = pop @l; -$forecast = unpad($forecast); # make a hash out of the args my %args = map {split /\s*=\s*/, lc $_} @l; # check the ranges of each one -push @out, $self->msg('wwv1', 'k') unless $args{k} && $args{k} >= 0 && $args{k} <= 9; -push @out, $self->msg('wwv1', 'a') unless $args{a} && $args{a} >= 0 && $args{a} <= 400; -push @out, $self->msg('wwv1', 'sf') unless $args{sf} && $args{sf} >= 65 && $args{sf} <= 300; +push @out, $self->msg('wwv1', 'k') unless defined $args{k} && $args{k} >= 0 && $args{k} <= 9; +push @out, $self->msg('wwv1', 'a') unless defined $args{a} && $args{a} >= 0 && $args{a} <= 400; +push @out, $self->msg('wwv1', 'sf') unless defined $args{sf} && $args{sf} >= 65 && $args{sf} <= 300; push @out, $self->msg('wwv1', 'forecast') unless $forecast; push @out, $self->msg('wwv2') if Geomag::dup($d, $args{sf}, $args{k}, $args{a}, $forecast);