From: djk <djk>
Date: Wed, 8 Mar 2000 22:24:47 +0000 (+0000)
Subject: bit more tidying up
X-Git-Tag: R_1_39~21
X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=commitdiff_plain;h=bd112338bcd942b903af05dd76a01dca2cc9c026;p=spider.git

bit more tidying up
---

diff --git a/cmd/show/qra.pl b/cmd/show/qra.pl
index 6269a0d5..f18b29b4 100644
--- 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 a6c07448..0e4ec580 100644
--- 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;