X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProtout.pm;h=657057c9e03cbb99f056457018714bdc050af177;hb=59ecaaed0f74040c74cbe66557c26aa8a536ee41;hp=9792d161f9de0aafe254b001ffbfee5667474bce;hpb=5701240b2fd65ea249a7c16a4f83797a0e0d88f4;p=spider.git

diff --git a/perl/DXProtout.pm b/perl/DXProtout.pm
index 9792d161..657057c9 100644
--- a/perl/DXProtout.pm
+++ b/perl/DXProtout.pm
@@ -20,13 +20,15 @@ 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);
+use vars qw($sentencelth $handle_xml);
 
 $sentencelth = 180;
- 
+
 #
 # All the PCxx generation routines
 #
@@ -121,8 +123,9 @@ sub pc17
 # 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 $handle_xml; 
+	return "PC18^DXSpider Version: $main::version Build: $main::build$flags^$DXProt::myprot_version^";
 }
 
 #
@@ -141,8 +144,6 @@ sub pc19
 		my $here = $ref->here;
 		my $conf = $ref->conf;
 		my $version = $ref->version;
-		$version = 5300 + int($version*100) if $version < 2;
-		$version = 5250 + 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);