X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProtout.pm;h=2325e7a5cb36c9c9d1bfd51531c3638d3e315314;hb=7e2b5e1e1f0543a093151889d6e76bcce82bae86;hp=135ce61aa1072c6a7684a78adc0ffebaffd5200d;hpb=281bb0799ecf66390c48719f76ca5d9f83fe4c73;p=spider.git diff --git a/perl/DXProtout.pm b/perl/DXProtout.pm index 135ce61a..2325e7a5 100644 --- a/perl/DXProtout.pm +++ b/perl/DXProtout.pm @@ -6,7 +6,7 @@ # # Copyright (c) 1998 Dirk Koopman G1TLH # -# $Id$ +# # package DXProt; @@ -19,7 +19,7 @@ use DXDebug; use strict; -use vars qw($sentencelth); +use vars qw($sentencelth $pc19_version); $sentencelth = 180; @@ -117,8 +117,7 @@ sub pc17 # Request init string sub pc18 { - my $flags = " pc9x"; - $flags .= " xml" if DXXml::available(); + my $flags = shift; return "PC18^DXSpider Version: $main::version Build: $main::subversion.$main::build$flags^$DXProt::myprot_version^"; } @@ -138,6 +137,8 @@ sub pc19 my $here = $ref->here; my $conf = $ref->conf; my $version = $ref->version; + $version = $pc19_version unless $version =~ /^\d\d\d\d$/; + my $str = "^$here^$call^$conf^$version"; if (length($s) + length($str) > $sentencelth) { push @out, "PC19" . $s . sprintf "^%s^", get_hops(19); @@ -379,6 +380,7 @@ sub _gen_pc92 my $s = "PC92^$main::mycall^" . gen_pc9x_t() . "^$sort"; for (@_) { $s .= "^" . _encode_pc92_call($_, $ext); + $ext = 0; # only the first slot has an ext. } return $s . '^H99^'; }