projects
/
spider.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4c359e4
)
check for qra locator and offer alternative
author
minima
<minima>
Mon, 5 Mar 2001 23:42:40 +0000
(23:42 +0000)
committer
minima
<minima>
Mon, 5 Mar 2001 23:42:40 +0000
(23:42 +0000)
cmd/set/location.pl
patch
|
blob
|
history
perl/Messages
patch
|
blob
|
history
diff --git
a/cmd/set/location.pl
b/cmd/set/location.pl
index 41f44194005f73d2f404ead1377d220880ef45a8..8d1f135073264b5e44290eb7ce2e7696192a0247 100644
(file)
--- a/
cmd/set/location.pl
+++ b/
cmd/set/location.pl
@@
-15,6
+15,7
@@
$line =~ s/^\s+//;
$line =~ s/\s+$//;
return (1, $self->msg('loce1')) if !$line;
$line =~ s/\s+$//;
return (1, $self->msg('loce1')) if !$line;
+return (1, $self->msg('loce3', uc $line)) if DXBearing::is_qra($line);
return (1, $self->msg('loce2', $line)) unless $line =~ /\d+ \d+ [NnSs] \d+ \d+ [EeWw]/o;
$user = DXUser->get_current($call);
return (1, $self->msg('loce2', $line)) unless $line =~ /\d+ \d+ [NnSs] \d+ \d+ [EeWw]/o;
$user = DXUser->get_current($call);
diff --git
a/perl/Messages
b/perl/Messages
index 46194311a76bd2eb3ac56a744d19d5e11adb5d1b..f25d43de24372708d8ddfd5e55b0fabe1bb7d28c 100644
(file)
--- a/
perl/Messages
+++ b/
perl/Messages
@@
-116,6
+116,7
@@
package DXM;
lh1 => '$main::data/hop_table.pl doesn\'t exist',
\r
loce1 => 'Please enter your location,, set/location <latitude longitude>',
\r
loce2 => 'Don\'t recognise \"$_[0]\" as a Lat/Long (eg 52 20 N 0 16 E)',
\r
lh1 => '$main::data/hop_table.pl doesn\'t exist',
\r
loce1 => 'Please enter your location,, set/location <latitude longitude>',
\r
loce2 => 'Don\'t recognise \"$_[0]\" as a Lat/Long (eg 52 20 N 0 16 E)',
\r
+ loce3 => '$_[0] is a QRA locator, please use: set/qra $_[0]',
\r
loc => 'Your Lat/Long is now \"$_[0]\"',
\r
lockout => '$_[0] Locked out',
\r
lockoutc => '$_[0] Created and Locked out',
\r
loc => 'Your Lat/Long is now \"$_[0]\"',
\r
lockout => '$_[0] Locked out',
\r
lockoutc => '$_[0] Created and Locked out',
\r