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));
-$main::build += $VERSION;
-$main::branch += $BRANCH;
-
use vars qw($sentencelth);
$sentencelth = 180;
-
+
#
# All the PCxx generation routines
#
# 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^~";
}
#
next unless $_;
my $ref = $_;
my $str = sprintf "^%s %s %d", $ref->call, $ref->conf ? '*' : '-', $ref->here;
- if (length($s) + length($str) >= $sentencelth) {
+ if (length($s) + length($str) > $sentencelth) {
push @out, "PC16^$ncall" . $s . sprintf "^%s^", get_hops(16);
$s = "";
}
$s .= $str;
}
- push @out, "PC16^$ncall" . $s . sprintf "^%s^", get_hops(16) if length $s;
+ push @out, "PC16^$ncall" . $s . sprintf "^%s^", get_hops(16);
return @out;
}
# 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^";
}
#
my $conf = $ref->conf;
my $version = $ref->version;
my $str = "^$here^$call^$conf^$version";
- if (length($s) + length($str) >= $sentencelth) {
+ if (length($s) + length($str) > $sentencelth) {
push @out, "PC19" . $s . sprintf "^%s^", get_hops(19);
$s = "";
}
$s .= $str;
}
- push @out, "PC19" . $s . sprintf "^%s^", get_hops(19) if length $s;
+ push @out, "PC19" . $s . sprintf "^%s^", get_hops(19);
return @out;
}