X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProtout.pm;h=d035f7ae605a0faeb77af87b5534ee3f1eada2b5;hb=4f2b8661933ee3e3ccda2596d30485d98dd18ecb;hp=a5498a0c8a45568675d23eb7fc5fea38094dd3e3;hpb=45495d980ec748f19509c7668d6b92a06f216ed7;p=spider.git

diff --git a/perl/DXProtout.pm b/perl/DXProtout.pm
index a5498a0c..d035f7ae 100644
--- a/perl/DXProtout.pm
+++ b/perl/DXProtout.pm
@@ -20,10 +20,8 @@ use DXDebug;
 use strict;
 
 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($sentencelth);
 
@@ -109,8 +107,8 @@ sub pc16
 sub pc17
 {
 	my @out;
+	my $node = shift;
 	while (@_) {
-		my $node = shift;
 		my $ref = shift;
 		my $hops = get_hops(17);
 		my $ncall = $node->call;
@@ -123,7 +121,8 @@ sub pc17
 # Request init string
 sub pc18
 {
-	return "PC18^DXSpider Version: $main::version Build: $main::build^$DXProt::myprot_version^";
+	my $v = $DXProt::myprot_version + $main::version;
+	return "PC18^DXSpider Version: $main::version Build: $main::build^$v^";
 }
 
 #
@@ -142,6 +141,8 @@ sub pc19
 		my $here = $ref->here;
 		my $conf = $ref->conf;
 		my $version = $ref->version;
+		$version = 5300 + int($version*100) if $version < 2;
+		$version = 5252 + int($version*100) if $version < 3;
 		my $str = "^$here^$call^$conf^$version";
 		if (length($s) + length($str) > $sentencelth) {
 			push @out, "PC19" . $s . sprintf "^%s^", get_hops(19);