projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
adjustments ...
[spider.git]
/
cmd
/
dx.pl
diff --git
a/cmd/dx.pl
b/cmd/dx.pl
index a4ea8464b8a807b669e58ce4d7a31429221142bb..c7161b62b7887c99d232362b1249e61ad6c0060c 100644
(file)
--- a/
cmd/dx.pl
+++ b/
cmd/dx.pl
@@
-33,14
+33,14
@@
if ($f[0] =~ /^by$/i) {
}
# get the freq and callsign either way round
}
# get the freq and callsign either way round
-if (
$f[0] =~ /[A-Za-z]/
) {
+if (
is_freq($f[1]) && $f[0] =~ m{^[\w\d]+(?:/[\w\d]+){0,2}$}
) {
$spotted = uc $f[0];
$freq = $f[1];
$spotted = uc $f[0];
$freq = $f[1];
-} elsif (
$f[0] =~ /^[0-9\.\,]+$/
) {
+} elsif (
is_freq($f[0]) && $f[1] =~ m{^[\w\d]+(?:/[\w\d]+){0,2}$}
) {
$freq = $f[0];
$spotted = uc $f[1];
} else {
$freq = $f[0];
$spotted = uc $f[1];
} else {
- return (1, $self->msg('dx
2
'));
+ return (1, $self->msg('dx
3
'));
}
# make line the rest of the line
}
# make line the rest of the line
@@
-94,7
+94,8
@@
if ($spotted le ' ') {
return (1, @out) unless $valid;
my @bad;
return (1, @out) unless $valid;
my @bad;
-if (@bad = BadWords::check($line)) {
+if (@bad = BadWords::check($line)) {
+ $self->badcount(($self->badcount||0) + @bad);
return (1, $self->msg('e17', @bad));
}
return (1, $self->msg('e17', @bad));
}