From 16d19a14ff3c7622cb81ab0312d674fde6b2af83 Mon Sep 17 00:00:00 2001
From: Dirk Koopman <djk@tobit.co.uk>
Date: Sun, 10 Feb 2008 18:28:20 +0000
Subject: [PATCH] sort show/node output
---
Changes | 2 ++
cmd/show/node.pl | 20 ++++++++++++--------
perl/ExtMsg.pm | 2 +-
perl/Version.pm | 2 +-
4 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/Changes b/Changes
index 7ca4da07..d2b1b980 100644
--- a/Changes
+++ b/Changes
@@ -1,3 +1,5 @@
+05Feb08=======================================================================
+1. Added a Windows only BPQ interface from the man himself: John G8BPQ.
07Jan08=======================================================================
1. more changes to cty.dat
07Jan08=======================================================================
diff --git a/cmd/show/node.pl b/cmd/show/node.pl
index 4e812551..66379435 100644
--- a/cmd/show/node.pl
+++ b/cmd/show/node.pl
@@ -37,7 +37,7 @@ if (@call == 0) {
}
my $call;
-foreach $call (@call) {
+foreach $call (sort @call) {
my $clref = Route::Node::get($call);
my $uref = DXUser->get_current($call);
my ($sort, $ver, $build);
@@ -45,14 +45,14 @@ foreach $call (@call) {
my $pcall = sprintf "%-11s", $call;
push @out, $self->msg('snode1') unless @out > 0;
if ($uref) {
- $sort = "Unknwn";
- $sort = "Spider" if $uref->is_spider;
- $sort = "AK1A " if $uref->is_ak1a;
+ $sort = "Spider" if $uref->is_spider || ($clref && $clref->do_pc9x);
$sort = "Clx " if $uref->is_clx;
$sort = "User " if $uref->is_user;
$sort = "BBS " if $uref->is_bbs;
$sort = "DXNet " if $uref->is_dxnet;
$sort = "ARClus" if $uref->is_arcluster;
+ $sort = "AK1A " if !$sort && $uref->is_ak1a;
+ $sort = "Unknwn" unless $sort;
} else {
push @out, $self->msg('snode3', $call);
next;
@@ -64,16 +64,20 @@ foreach $call (@call) {
$ver = $main::version;
} else {
$ver = $clref->version if $clref && $clref->version;
- $ver = $uref->version if $ver && $uref->version;
+ $ver = $uref->version if !$ver && $uref->version;
}
- my ($major, $minor, $subs) = unpack("AAA*", $ver) if $ver;
- if ($uref->is_spider) {
+ if ($uref->is_spider || ($clref && $clref->do_pc9x)) {
$ver /= 100 if $ver > 5400;
$ver -= 53 if $ver > 54;
- $build = "build: " . $uref->build if $uref->build;
+ if ($clref && $clref->build) {
+ $build = "build: " . $clref->build
+ } elsif ($uref->build) {
+ $build = "build: " . $uref->build;
+ }
push @out, $self->msg('snode2', $pcall, $sort, "$ver $build");
} else {
+ my ($major, $minor, $subs) = unpack("AAA*", $ver) if $ver;
push @out, $self->msg('snode2', $pcall, $sort, $ver ? "$major\-$minor.$subs" : " ");
}
++$count;
diff --git a/perl/ExtMsg.pm b/perl/ExtMsg.pm
index 07e740ac..dd97475a 100644
--- a/perl/ExtMsg.pm
+++ b/perl/ExtMsg.pm
@@ -153,7 +153,7 @@ sub to_connected
delete $conn->{cmd};
$conn->{timeout}->del if $conn->{timeout};
delete $conn->{timeout};
- $conn->nolinger unless $conn->isa('AGWMsg');
+ $conn->nolinger unless $conn->isa('AGWMsg') || $conn->isa('BPQMsg');
&{$conn->{rproc}}($conn, "$dir$call|$sort");
$conn->_send_file("$main::data/connected") unless $conn->{outgoing};
}
diff --git a/perl/Version.pm b/perl/Version.pm
index 9c2f2b25..86bc5055 100644
--- a/perl/Version.pm
+++ b/perl/Version.pm
@@ -11,6 +11,6 @@ use vars qw($version $subversion $build);
$version = '1.54';
$subversion = '0';
-$build = '201';
+$build = '202';
1;
--
2.43.0