projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
change the default store for deletetime
[spider.git]
/
perl
/
DXUtil.pm
diff --git
a/perl/DXUtil.pm
b/perl/DXUtil.pm
index fc7cd024d7737a96326f8a4a69316069b8c696f4..c633413e7bfa2a0fdef19fde66645dffcef91ce6 100644
(file)
--- a/
perl/DXUtil.pm
+++ b/
perl/DXUtil.pm
@@
-17,7
+17,7
@@
use strict;
use vars qw($VERSION $BRANCH);
$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
use vars qw($VERSION $BRANCH);
$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/
) || 0
;
+$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/
|| (0,0))
;
$main::build += $VERSION;
$main::branch += $BRANCH;
$main::build += $VERSION;
$main::branch += $BRANCH;
@@
-149,6
+149,7
@@
sub promptf
$dd->Terse(1);
$dd->Quotekeys(0);
$value = $dd->Dumpxs;
$dd->Terse(1);
$dd->Quotekeys(0);
$value = $dd->Dumpxs;
+ $value =~ s/([\r\n\t])/sprintf("%%%02X", ord($1))/eg;
}
$prompt = sprintf "%15s: %s", $prompt, $value;
return ($priv, $prompt);
}
$prompt = sprintf "%15s: %s", $prompt, $value;
return ($priv, $prompt);
@@
-346,8
+347,9
@@
sub is_callsign
# check that a PC protocol field is valid text
sub is_pctext
{
# check that a PC protocol field is valid text
sub is_pctext
{
+ return undef unless length $_[0];
return undef if $_[0] =~ /[\x00-\x08\x0a-\x1f\x80-\x9f]/;
return undef if $_[0] =~ /[\x00-\x08\x0a-\x1f\x80-\x9f]/;
- return
$_[0]
;
+ return
1
;
}
# check that a PC prot flag is fairly valid (doesn't check the difference between 1/0 and */-)
}
# check that a PC prot flag is fairly valid (doesn't check the difference between 1/0 and */-)
@@
-377,7
+379,7
@@
sub is_qra
# does it look like a valid lat/long
sub is_latlong
{
# does it look like a valid lat/long
sub is_latlong
{
- return $_[0] =~ /^\s*\d{1,2}\s+\d{1,2}\s*[NnSs]\s+\d{1,2}\s+\d{1,2}\s*[EeWw]\s*$/;
+ return $_[0] =~ /^\s*\d{1,2}\s+\d{1,2}\s*[NnSs]\s+
1?
\d{1,2}\s+\d{1,2}\s*[EeWw]\s*$/;
}
# insert an item into a list if it isn't already there returns 1 if there 0 if not
}
# insert an item into a list if it isn't already there returns 1 if there 0 if not