projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
put pc16/17 handling back the way it was
[spider.git]
/
perl
/
DXProtout.pm
diff --git
a/perl/DXProtout.pm
b/perl/DXProtout.pm
index 180ce526ef17357c67d474bc45c34b9994e0b368..0e12aa10cfe587e89dccab7a9a539c6966ce37c0 100644
(file)
--- a/
perl/DXProtout.pm
+++ b/
perl/DXProtout.pm
@@
-20,10
+20,8
@@
use DXDebug;
use strict;
use vars qw($VERSION $BRANCH);
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;
+
+main::mkver($VERSION = q$Revision$);
use vars qw($sentencelth);
use vars qw($sentencelth);
@@
-66,14
+64,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^~";
}
#
}
#
@@
-122,7
+121,8
@@
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 $v = $DXProt::myprot_version + $main::version;
+ return "PC18^DXSpider Version: $main::version Build: $main::build^$v^";
}
#
}
#