X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=perl%2FDXProtout.pm;h=82905dadbcd81780ebe185abcbbcef5fc9ec0dc3;hb=b9dffeff7239952814342dad19db3a51def6fab7;hp=8edc0831eb327df41a1f81ea1655953b48142dee;hpb=2b58ccdf81685a1167a43c38705a0d84b9d8d661;p=spider.git

diff --git a/perl/DXProtout.pm b/perl/DXProtout.pm
index 8edc0831..82905dad 100644
--- a/perl/DXProtout.pm
+++ b/perl/DXProtout.pm
@@ -19,11 +19,9 @@ 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;
-$main::build += $VERSION;
-$main::branch += $BRANCH;
+use vars qw($sentencelth);
+
+$sentencelth = 180;
 
 #
 # All the PCxx generation routines
@@ -32,7 +30,7 @@ $main::branch += $BRANCH;
 # create a talk string ($from, $to, $via, $text)
 sub pc10
 {
-	my ($from, $to, $via, $text) = @_;
+	my ($from, $to, $via, $text, $origin) = @_;
 	my ($user1, $user2);
 	if ($via && $via ne $to) {
 		$user1 = $via;
@@ -41,10 +39,11 @@ sub pc10
 		$user2 = ' ';
 		$user1 = $to;
 	}
+	$origin ||= $main::mycall;
 	$text = unpad($text);
 	$text = ' ' unless $text && length $text > 0;
 	$text =~ s/\^/%5E/g;
-	return "PC10^$from^$user1^$text^*^$user2^$main::mycall^~";  
+	return "PC10^$from^$user1^$text^*^$user2^$origin^~";  
 }
 
 # create a dx message (call, freq, dxcall, text) 
@@ -61,14 +60,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^~";
 }
 
 #
@@ -84,15 +84,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;
 }
 
@@ -114,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^";
 }
 
 #
@@ -123,20 +128,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;
 }
 
@@ -209,7 +218,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^~";
 }
@@ -359,6 +368,11 @@ sub pc85
 	return "PC85^$tonode^$fromnode^$call^$msg^~";
 }
 
+# spider route broadcast
+sub pc90
+{
+}
+
 1;
 __END__