X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProtout.pm;h=04eefe39b1e1d9d0446b757de619d8b6e4eba1bd;hb=a472851a7e290dac262131fd7f73b567332df6e4;hp=a8a609b96d76cfbdc2024d49453477f35d792161;hpb=5b3c2c5e342c23fbab96b7573c5963344617878f;p=spider.git

diff --git a/perl/DXProtout.pm b/perl/DXProtout.pm
index a8a609b9..04eefe39 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,7 @@ sub pc17
 # Request init string
 sub pc18
 {
-	my $v = $DXProt::myprot_version + $main::version;
+	my $v = $DXProt::myprot_version + int($main::version * 100);
 	return "PC18^DXSpider Version: $main::version Build: $main::build^$v^";
 }
 
@@ -142,7 +140,10 @@ sub pc19
 		my $call = $ref->call;
 		my $here = $ref->here;
 		my $conf = $ref->conf;
-		my $version = $ref->version;
+		my $version = $ref->version || 5401;
+		$version = 5300 + int($version*100) if $version < 2;
+		$version = 5252 + int($version*100) if $version < 3;
+		$version =~ s/\.\d+$//;	# kludge
 		my $str = "^$here^$call^$conf^$version";
 		if (length($s) + length($str) > $sentencelth) {
 			push @out, "PC19" . $s . sprintf "^%s^", get_hops(19);