projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add uref for call in edu
[spider.git]
/
perl
/
Aranea.pm
diff --git
a/perl/Aranea.pm
b/perl/Aranea.pm
index 7973e6256ccb9b9cb29eee0d71f16dd877676a6d..bbe24bbd5194e7cd9c565cf9dfb5318564377601 100644
(file)
--- a/
perl/Aranea.pm
+++ b/
perl/Aranea.pm
@@
-25,12
+25,11
@@
use Script;
use Verify;
use DXDupe;
use Thingy;
use Verify;
use DXDupe;
use Thingy;
+use RouteDB;
use vars qw($VERSION $BRANCH);
use vars qw($VERSION $BRANCH);
-$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /^\d+\.\d+(?:\.(\d+)\.(\d+))?$/ || (0,0));
-$main::build += $VERSION;
-$main::branch += $BRANCH;
+
+main::mkver($VERSION = q$Revision$);
use vars qw(@ISA $ntpflag $dupeage);
use vars qw(@ISA $ntpflag $dupeage);
@@
-294,9
+293,9
@@
sub input
# validate it further
$err .= "missing cmd or data," unless $cmd && $data;
$err .= "invalid command ($cmd)," unless $cmd =~ /^[A-Z][A-Z0-9]*$/;
# validate it further
$err .= "missing cmd or data," unless $cmd && $data;
$err .= "invalid command ($cmd)," unless $cmd =~ /^[A-Z][A-Z0-9]*$/;
- my ($gp, $tus) = split /:/, $group, 2;
+ my ($gp, $tus) = split /:/, $group, 2
if $group
;
- $err .= "invalid group ($gp),"
unless $gp =
~ /^[A-Z0-9]{2,}$/;
+ $err .= "invalid group ($gp),"
if $gp && $gp !
~ /^[A-Z0-9]{2,}$/;
$err .= "invalid tocall ($tus)," if $tus && !is_callsign($tus);
$err .= "invalid fromcall ($user)," if $user && !is_callsign($user);
$err .= "invalid tocall ($tus)," if $tus && !is_callsign($tus);
$err .= "invalid fromcall ($user)," if $user && !is_callsign($user);
@@
-325,7
+324,7
@@
sub input
$thing->{touser} = $tus if $tus;
$thing->{user} = $user if $user;
$thing->{hopsaway} = $hop;
$thing->{touser} = $tus if $tus;
$thing->{user} = $user if $user;
$thing->{hopsaway} = $hop;
-
+
for (split(/,/, $rdata)) {
if (/=/) {
my ($k,$v) = split /=/, $_, 2;
for (split(/,/, $rdata)) {
if (/=/) {
my ($k,$v) = split /=/, $_, 2;