get the location regex right and use it everywhere

[spider.git] / cmd / set / sys_location.pl

diff --git a/cmd/set/sys_location.pl b/cmd/set/sys_location.pl
index aac91823a694117ff464107b070acee534971f1a..58fb6ae5b5c7467818149f4ae2780f5c8b9e0151 100644 (file)
--- a/cmd/set/sys_location.pl
+++ b/cmd/set/sys_location.pl
@@ -17,7 +17,8 @@ $line =~ s/^\s+//;
 $line =~ s/\s+$//;
 
 return (1, $self->msg('loce1')) if !$line;
-return (1, $self->msg('loce2', $line)) unless $line =~ /\d+ \d+ [NnSs] \d+ \d+ [EeWw]/o;
+return (1, $self->msg('loce3', uc $line)) if is_qra($line);
+return (1, $self->msg('loce2', $line)) unless is_latlong($line);
 
 $user = DXUser->get_current($call);
 if ($user) {