X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProtout.pm;h=522352e48d97cc35b61020e33b10c2cdd1aa092e;hb=edfc15583881f720a65516d975d26cdb6b7c8469;hp=c87e96ca8f4378d2e97d70b2b72009bb8ef46c79;hpb=dbf7523a9b228dbdf1d03109afde351b8b194fab;p=spider.git

diff --git a/perl/DXProtout.pm b/perl/DXProtout.pm
index c87e96ca..522352e4 100644
--- a/perl/DXProtout.pm
+++ b/perl/DXProtout.pm
@@ -25,6 +25,10 @@ $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
 #
@@ -62,14 +66,15 @@ sub pc11
 # create an announce message
 sub pc12
 {
-	my ($call, $text, $tonode, $sysop, $wx) = @_;
+	my ($call, $text, $tonode, $sysop, $wx, $origin) = @_;
 	my $hops = get_hops(12);
-	$sysop = ' ' if !$sysop;
-	$text = ' ' if !$text;
-	$wx = '0' if !$wx;
-	$tonode = '*' if !$tonode;
+	$text ||= ' ';
 	$text =~ s/\^/%5E/g;
-	return "PC12^$call^$tonode^$text^$sysop^$main::mycall^$wx^$hops^~";
+	$tonode ||= '*';
+	$sysop ||= ' ';
+	$wx ||= '0';
+	$origin ||= $main::mycall;
+	return "PC12^$call^$tonode^$text^$sysop^$origin^$wx^$hops^~";
 }
 
 #
@@ -85,15 +90,18 @@ sub pc16
 	my $ncall = $node->call;
 	my @out;
 
-	while (@_) {
-		my $str = "PC16^$ncall";
-		for ( ; @_ && length $str < 200; ) {
-			my $ref = shift;
-			$str .= sprintf "^%s %s %d", $ref->call, $ref->conf ? '*' : '-', $ref->here;
+	my $s = "";
+	for (@_) {
+		next unless $_;
+		my $ref = $_;
+		my $str = sprintf "^%s %s %d", $ref->call, $ref->conf ? '*' : '-', $ref->here;
+		if (length($s) + length($str) > $sentencelth) {
+			push @out, "PC16^$ncall" . $s . sprintf "^%s^", get_hops(16);
+			$s = "";
 		}
-		$str .= sprintf "^%s^", get_hops(16);
-		push @out, $str;
+		$s .= $str;
 	}
+	push @out, "PC16^$ncall" . $s . sprintf "^%s^", get_hops(16);
 	return @out;
 }
 
@@ -115,7 +123,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^";
 }
 
 #
@@ -124,20 +134,24 @@ sub pc18
 sub pc19
 {
 	my @out;
-
-	while(@_) {
-		my $str = "PC19";
-		for (; @_ && length $str < 200;) {
-			my $ref = shift;
-			my $call = $ref->call;
-			my $here = $ref->here;
-			my $conf = $ref->conf;
-			my $version = $ref->version;
-			$str .= "^$here^$call^$conf^$version";
+	my @in;
+
+	my $s = "";
+	for (@_) {
+		next unless $_;
+		my $ref = $_;
+		my $call = $ref->call;
+		my $here = $ref->here;
+		my $conf = $ref->conf;
+		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);
+			$s = "";
 		}
-		$str .= sprintf "^%s^", get_hops(19);
-		push @out, $str;
+		$s .= $str;
 	}
+	push @out, "PC19" . $s . sprintf "^%s^", get_hops(19);
 	return @out;
 }
 
@@ -210,7 +224,7 @@ sub pc28
 sub pc29 
 {
 	my ($fromnode, $tonode, $stream, $text) = @_;
-	$text = ' ' unless $text && length $text > 0;
+	$text = ' ' unless defined $text && length $text > 0;
 	$text =~ s/\^/%5E/og;			# remove ^
 	return "PC29^$fromnode^$tonode^$stream^$text^~";
 }