X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProtout.pm;h=34419e3be4c13986c07ceb6ecd4a1102d4368c27;hb=40e8bb424384f2aa4f772e02cb2caedbc41525cd;hp=180ce526ef17357c67d474bc45c34b9994e0b368;hpb=22df46c61d3f1ae4115224bcc230ffe7ed6aff99;p=spider.git

diff --git a/perl/DXProtout.pm b/perl/DXProtout.pm
index 180ce526..34419e3b 100644
--- a/perl/DXProtout.pm
+++ b/perl/DXProtout.pm
@@ -21,7 +21,7 @@ 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));
+$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/,(0,0));
 $main::build += $VERSION;
 $main::branch += $BRANCH;
 
@@ -66,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;
+	$origin ||= $main::mycall;
+	$sysop ||= ' ';
+	$text ||= ' ';
+	$wx ||= '0';
+	$tonode ||= '*';
 	$text =~ s/\^/%5E/g;
-	return "PC12^$call^$tonode^$text^$sysop^$main::mycall^$wx^$hops^~";
+	return "PC12^$call^$tonode^$text^$sysop^$origin^$wx^$hops^~";
 }
 
 #