projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove obsolete gconsole
[spider.git]
/
perl
/
DXProtout.pm
diff --git
a/perl/DXProtout.pm
b/perl/DXProtout.pm
index 6917b88b8501b384d34fa958464911e4f54aa975..522352e48d97cc35b61020e33b10c2cdd1aa092e 100644
(file)
--- a/
perl/DXProtout.pm
+++ b/
perl/DXProtout.pm
@@
-28,7
+28,7
@@
$main::branch += $BRANCH;
use vars qw($sentencelth);
$sentencelth = 180;
use vars qw($sentencelth);
$sentencelth = 180;
-
+
#
# All the PCxx generation routines
#
#
# All the PCxx generation routines
#
@@
-66,14
+66,15
@@
sub pc11
# create an announce message
sub pc12
{
# create an announce message
sub pc12
{
- my ($call, $text, $tonode, $sysop, $wx) = @_;
+ my ($call, $text, $tonode, $sysop, $wx
, $origin
) = @_;
my $hops = get_hops(12);
my $hops = get_hops(12);
- $sysop = ' ' if !$sysop;
- $text = ' ' if !$text;
- $wx = '0' if !$wx;
- $tonode = '*' if !$tonode;
+ $text ||= ' ';
$text =~ s/\^/%5E/g;
$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^~";
}
#
}
#
@@
-94,13
+95,13
@@
sub pc16
next unless $_;
my $ref = $_;
my $str = sprintf "^%s %s %d", $ref->call, $ref->conf ? '*' : '-', $ref->here;
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);
$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;
}
return @out;
}
@@
-122,7
+123,9
@@
sub pc17
# Request init string
sub pc18
{
# 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^";
}
#
}
#
@@
-142,13
+145,13
@@
sub pc19
my $conf = $ref->conf;
my $version = $ref->version;
my $str = "^$here^$call^$conf^$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);
$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;
}
return @out;
}