From 43436b1b70ab2c2f8bd8ed511061b45a2f5be8a6 Mon Sep 17 00:00:00 2001 From: Dirk Koopman Date: Tue, 17 Jun 2014 21:39:55 +0100 Subject: [PATCH] added some actual code to sh/wx --- Changes | 1 + cmd/show/wx.pl | 32 +++++++++++++++++++++++++++++++- perl/Version.pm | 4 ++-- 3 files changed, 34 insertions(+), 3 deletions(-) diff --git a/Changes b/Changes index 1e56c6cc..d6ecb295 100644 --- a/Changes +++ b/Changes @@ -3,6 +3,7 @@ 2. Arrange for all file searching routines based on sh/dx or sh/log to be non-blocking. This should allow incoming and outgoing protocol to continue flowing when such a command is run. +3. Added some usable code to show/wx (finally). 16Jun14======================================================================= 1. Get AsyncMsg working for HTTP type ephemeral connections 21Apr14======================================================================= diff --git a/cmd/show/wx.pl b/cmd/show/wx.pl index f32d6282..81a81bf7 100644 --- a/cmd/show/wx.pl +++ b/cmd/show/wx.pl @@ -1,4 +1,34 @@ # # show wx data # -return (1, "not implemented yet"); +my $self = shift; + +# this appears to be a reasonable thing for users to do (thank you JE1SGH) +# return (1, $self->msg('e5')) if $self->priv < 9; + +my $cmdline = shift; +my @f = split /\s+/, $cmdline; +my $f; +my @out; +my ($from, $to); + +$from = 0; +while ($f = shift @f) { # next field + # print "f: $f list: ", join(',', @list), "\n"; + if (!$from && !$to) { + ($from, $to) = $f =~ /^(\d+)-(\d+)$/o; # is it a from -> to count? + next if $from && $to > $from; + } + if (!$to) { + ($to) = $f =~ /^(\d+)$/o if !$to; # is it a to count? + next if $to; + } +} + +$to = 20 unless $to; +$from = 0 unless $from; + +@out = $self->spawn_cmd(\&DXLog::print, args => [$from, $to, $main::systime, 'ann', 'WX']); + +#@out = DXLog::print($from, $to, $main::systime, 'ann', $who); +return (1, @out); diff --git a/perl/Version.pm b/perl/Version.pm index 9a44144c..bda3e650 100644 --- a/perl/Version.pm +++ b/perl/Version.pm @@ -10,7 +10,7 @@ package main; use vars qw($version $build $gitversion); $version = '1.57'; -$build = '25'; -$gitversion = '1c9b725'; +$build = '26'; +$gitversion = '96b4514'; 1; -- 2.34.1