X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProtout.pm;h=82905dadbcd81780ebe185abcbbcef5fc9ec0dc3;hb=b9dffeff7239952814342dad19db3a51def6fab7;hp=b31eacdfe111942ded8607bc9759d85e1179a56c;hpb=f47bc72134852f42fe03ab6afe91a9ba1b0ff705;p=spider.git

diff --git a/perl/DXProtout.pm b/perl/DXProtout.pm
index b31eacdf..82905dad 100644
--- a/perl/DXProtout.pm
+++ b/perl/DXProtout.pm
@@ -19,16 +19,10 @@ 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;
-
 use vars qw($sentencelth);
 
 $sentencelth = 180;
- 
+
 #
 # All the PCxx generation routines
 #
@@ -68,12 +62,12 @@ sub pc12
 {
 	my ($call, $text, $tonode, $sysop, $wx, $origin) = @_;
 	my $hops = get_hops(12);
-	$origin ||= $main::mycall;
-	$sysop ||= ' ';
 	$text ||= ' ';
-	$wx ||= '0';
-	$tonode ||= '*';
 	$text =~ s/\^/%5E/g;
+	$tonode ||= '*';
+	$sysop ||= ' ';
+	$wx ||= '0';
+	$origin ||= $main::mycall;
 	return "PC12^$call^$tonode^$text^$sysop^$origin^$wx^$hops^~";
 }
 
@@ -123,7 +117,9 @@ sub pc17
 # Request init string
 sub pc18
 {
-	return "PC18^DXSpider Version: $main::version Build: $main::build^$DXProt::myprot_version^";
+	my $flags = "";
+	$flags .= " xml" if DXXml::available(); 
+	return "PC18^DXSpider Version: $main::version Build: $main::build$flags^$DXProt::myprot_version^";
 }
 
 #