added some actual code to sh/wx

diff --git a/Changes b/Changes
index 1e56c6cc633f1a0546ae470e2df6da3c54689835..d6ecb295d4a160e1535218d91ec7ab2cd11fb4d2 100644 (file)
--- 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 f32d62823e98b02659a1656dbc788fecd8241cf8..81a81bf7d3b35131f546fc0a04f207c367c192bc 100644 (file)
--- 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 9a44144cf0478c5f20f8b384cdc688feceb13be1..bda3e650445e0779c80e2e2119e2d4e2661014dc 100644 (file)
--- 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;