projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
split DXProt into handlers and processing
[spider.git]
/
perl
/
DXProtout.pm
diff --git
a/perl/DXProtout.pm
b/perl/DXProtout.pm
index f08fef492bbfff7afd364cf1cf2c290593380494..5962665c482b942122fe307b3a89eabf8715778d 100644
(file)
--- a/
perl/DXProtout.pm
+++ b/
perl/DXProtout.pm
@@
-25,9
+25,10
@@
$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ || (0,0))
$main::build += $VERSION;
$main::branch += $BRANCH;
$main::build += $VERSION;
$main::branch += $BRANCH;
-use vars qw($sentencelth);
+use vars qw($sentencelth
$use_newroute
);
$sentencelth = 180;
$sentencelth = 180;
+$use_newroute = 1;
#
# All the PCxx generation routines
#
# All the PCxx generation routines
@@
-123,7
+124,8
@@
sub pc17
# Request init string
sub pc18
{
# Request init string
sub pc18
{
- return "PC18^DXSpider Version: $main::version Build: $main::build NewRoute^$DXProt::myprot_version^";
+ my $nr = $use_newroute ? ' !NRt' : '';
+ return "PC18^DXSpider Version: $main::version Build: $main::build$nr^$DXProt::myprot_version^";
}
#
}
#
@@
-372,7
+374,7
@@
sub hexstamp
$hexlastlet = chr(ord($hexlastlet) + 1);
} while ($hexlastlet eq '^');
}
$hexlastlet = chr(ord($hexlastlet) + 1);
} while ($hexlastlet eq '^');
}
- return sprintf "%
c
%08X", $hexlastlet, $hexlasttime;
+ return sprintf "%
s
%08X", $hexlastlet, $hexlasttime;
}
sub pc58
}
sub pc58
@@
-392,8
+394,9
@@
sub pc59
my @out;
my $sort = shift;
my $hexstamp = shift || hexstamp();
my @out;
my $sort = shift;
my $hexstamp = shift || hexstamp();
+ my $node = shift;
- my $
node = $_[0]->call
;
+ my $
s = "PC59^$sort^$hexstamp^$node"
;
for (@_) {
next unless $_;
my $ref = $_;
for (@_) {
next unless $_;
my $ref = $_;
@@
-401,7
+404,7
@@
sub pc59
my $here = $ref->here;
$s .= $ref->isa('Route::Node') ? "^N$here$call" : "^U$here$call";
}
my $here = $ref->here;
$s .= $ref->isa('Route::Node') ? "^N$here$call" : "^U$here$call";
}
- push @out,
"PC59^$sort^$hexstamp^$node^$s" . sprintf "
^%s^", get_hops(59);
+ push @out,
sprintf "$s
^%s^", get_hops(59);
return @out;
}
return @out;
}