projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix typo
[spider.git]
/
perl
/
DXProtout.pm
diff --git
a/perl/DXProtout.pm
b/perl/DXProtout.pm
index 3439b01da2881044439c75d0549a53c631ca7fba..522352e48d97cc35b61020e33b10c2cdd1aa092e 100644
(file)
--- a/
perl/DXProtout.pm
+++ b/
perl/DXProtout.pm
@@
-20,13
+20,15
@@
use DXDebug;
use strict;
use vars qw($VERSION $BRANCH);
use strict;
use vars qw($VERSION $BRANCH);
-
-main::mkver($VERSION = q$Revision$);
+$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;
use vars qw($sentencelth);
$sentencelth = 180;
use vars qw($sentencelth);
$sentencelth = 180;
-
+
#
# All the PCxx generation routines
#
#
# All the PCxx generation routines
#
@@
-107,8
+109,8
@@
sub pc16
sub pc17
{
my @out;
sub pc17
{
my @out;
- my $node = shift;
while (@_) {
while (@_) {
+ my $node = shift;
my $ref = shift;
my $hops = get_hops(17);
my $ncall = $node->call;
my $ref = shift;
my $hops = get_hops(17);
my $ncall = $node->call;
@@
-121,8
+123,9
@@
sub pc17
# Request init string
sub pc18
{
# Request init string
sub pc18
{
- my $v = $DXProt::myprot_version + $main::version;
- return "PC18^DXSpider Version: $main::version Build: $main::build^$v^";
+ my $flags = "";
+ $flags .= " xml" if DXXml::available();
+ return "PC18^DXSpider Version: $main::version Build: $main::build$flags^$DXProt::myprot_version^";
}
#
}
#
@@
-140,9
+143,7
@@
sub pc19
my $call = $ref->call;
my $here = $ref->here;
my $conf = $ref->conf;
my $call = $ref->call;
my $here = $ref->here;
my $conf = $ref->conf;
- my $version = $ref->version || 5401;
- $version = 5300 + int($version*100) if $version < 2;
- $version = 5252 + int($version*100) if $version < 3;
+ my $version = $ref->version;
my $str = "^$here^$call^$conf^$version";
if (length($s) + length($str) > $sentencelth) {
push @out, "PC19" . $s . sprintf "^%s^", get_hops(19);
my $str = "^$here^$call^$conf^$version";
if (length($s) + length($str) > $sentencelth) {
push @out, "PC19" . $s . sprintf "^%s^", get_hops(19);