bit more tidying up

diff --git a/cmd/show/qra.pl b/cmd/show/qra.pl
index 6269a0d57093336783d9ce9004bf12b84e2f4aab..f18b29b4b5af9da7b398886aba5fe7db3667d791 100644 (file)
--- a/cmd/show/qra.pl
+++ b/cmd/show/qra.pl
@@ -23,7 +23,7 @@ if (!$long && !$lat) {
 
 my $fqra = DXBearing::is_qra($list[0]);
 my $sqra = $list[0] =~ /^[A-Za-z][A-Za-z]\d\d$/;
-my $ll = $line =~ /^\d+\s+\d+\s*[NSns]\s+\d+\s+\d+\s*[EWew]/;
+my $ll = $line =~ /^\d+\s+\d+\s+[NSns]\s+\d+\s+\d+\s+[EWew]/;
 return (1, $self->msg('qrae2', $list[0])) unless $fqra || $sqra || $ll;
 
 # convert a lat/long into a qra locator

diff --git a/cmd/show/satellite.pl b/cmd/show/satellite.pl
index a6c07448c421c4de1d4ffbafeb15c48dceaee830..0e4ec5806f1c5314cf0a62c67ecbd8f9a80f10a9 100644 (file)
--- a/cmd/show/satellite.pl
+++ b/cmd/show/satellite.pl
@@ -17,7 +17,11 @@ my $step = shift @f;                         # tracking table resolution in minutes
 
 # default hours and step size
 $numhours = 3 unless $numhours && $numhours =~ /^\d+$/;
+$numhours = 3 if $numhours < 0;
+$numhours = 24 if $numhours > 24;
 $step = 5 unless $step && $step =~ /^\d+$/;
+$step = 5 if $step < 0;
+$step = 30 if $step > 30;
 
 # get nearest lat and long (I can see we will need the altitude here soon as well :-)
 my $lat = $self->user->lat;