a nominially working aranea with DX commands converted

[spider.git] / perl / DXProtout.pm

diff --git a/perl/DXProtout.pm b/perl/DXProtout.pm
index b31eacdfe111942ded8607bc9759d85e1179a56c..a8a609b96d76cfbdc2024d49453477f35d792161 100644 (file)
--- a/perl/DXProtout.pm
+++ b/perl/DXProtout.pm
@@ -68,12 +68,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 +123,8 @@ sub pc17
 # Request init string
 sub pc18
 {
-       return "PC18^DXSpider Version: $main::version Build: $main::build^$DXProt::myprot_version^";
+       my $v = $DXProt::myprot_version + $main::version;
+       return "PC18^DXSpider Version: $main::version Build: $main::build^$v^";
 }
 
 #