1. Upped the version no !!!!

2. made the DXProtocol routines much less sensitive to '~' characters (JE1SGH)
3. added '^' -> ':' conversions on ann, talk and dx commands
4. You can now send messages containing blank lines.
5. Fixed merge command problem reported by G0RDI

diff --git a/Changes b/Changes
index d083a17bb4387064a9924b79351611cb4bc77618..c1f2f0e06689f721c50093045f91651f1924a2f7 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,3 +1,9 @@
+03Jan99========================================================================
+1. Upped the version no !!!!
+2. made the DXProtocol routines much less sensitive to '~' characters (JE1SGH)
+3. added '^' -> ':' conversions on ann, talk and dx commands
+4. You can now send messages containing blank lines.
+5. Fixed merge command problem reported by G0RDI
 28Dec98========================================================================
 1. Crossed fingers, got rid of the instabilities caused by execing programs
 at vast speed (reduced it significantly anyway).

diff --git a/cmd/announce.pl b/cmd/announce.pl
index 6c66bcd027fcec77cf51b1fc0bd1cbbc4f76bdb2..bb5f7ad0b91135871b3bcafd5c4def0fc300529d 100644 (file)
--- a/cmd/announce.pl
+++ b/cmd/announce.pl
@@ -43,6 +43,9 @@ if ($sort eq "FULL") {
   $to = "LOCAL";
 }
 
+# change ^ into : for transmission
+$line =~ s/\^/:/og;
+
 Log('ann', $to, $from, $line);
 DXProt::broadcast_list("To $to de $from <$t>: $line", @locals);
 if ($to ne "LOCAL") {

diff --git a/cmd/dx.pl b/cmd/dx.pl
index 763bf9b0aace735bd8e7db629724c2c594fe15d6..6645856299290e239c3e885c3d7409aee29fe6ea 100644 (file)
--- a/cmd/dx.pl
+++ b/cmd/dx.pl
@@ -77,6 +77,9 @@ if ($spotted le ' ') {
 
 return (1, @out) if !$valid;
 
+# change ^ into : for transmission
+$line =~ s/\^/:/og;
+
 # Store it here
 if (Spot::add($freq, $spotted, $main::systime, $line, $spotter)) {
        # send orf to the users

diff --git a/cmd/merge.pl b/cmd/merge.pl
index 51620b603857a3eae87ec2481465d76e31468264..412ddccfe8ffd02a0eb7095a000567b7269c656f 100644 (file)
--- a/cmd/merge.pl
+++ b/cmd/merge.pl
@@ -20,7 +20,7 @@ return (1, $self->msg('e10', $call)) unless $ref;
 return (1, $self->msg('e13', $call)) unless $ref->isa('DXNode');
 
 
-my ($spots, $wwv) = $f[1] =~ m{(\d+/\d+)} if $f[1];
+my ($spots, $wwv) = $f[1] =~ m{(\d+)/(\d+)} if $f[1];
 $spots = 10 unless $spots;
 $wwv = 5 unless $wwv;
 

diff --git a/cmd/talk.pl b/cmd/talk.pl
index 899a44305a6a543e385e6282dbcd2f8bab85ba0e..e94fd0250e30cf262671082438df449fe666cad4 100644 (file)
--- a/cmd/talk.pl
+++ b/cmd/talk.pl
@@ -37,6 +37,9 @@ unless ($ref || $via) {
 }
 return (1, "$call not visible on the cluster") if !$ref;
 
+# change ^ into : for transmission
+$line =~ s/\^/:/og;
+
 my $dxchan = DXCommandmode->get($to); # is it for us?
 if ($dxchan && $dxchan->is_user) {
        $dxchan->send("$to de $from $line");

diff --git a/perl/DXCommandmode.pm b/perl/DXCommandmode.pm
index de59160663c080356a11a354c5a52b098f0f3ea1..b9d8e6cfc7d3b4e9f7eafadb2767cfc420f5df33 100644 (file)
--- a/perl/DXCommandmode.pm
+++ b/perl/DXCommandmode.pm
@@ -130,7 +130,7 @@ sub normal
                        $self->state('prompt');
                }
        } else {
-               @ans = run_cmd($self, $cmdline) if length $cmdline;
+               @ans = run_cmd($self, $cmdline);           # if length $cmdline;
                
                if ($self->{pagelth} && @ans > $self->{pagelth}) {
                        my $i;
@@ -175,6 +175,8 @@ sub run_cmd
                        return (1, "Syserr: Eval err $errstr on stored func $self->{func}");
                }
        } else {
+
+               return () if length $cmdline == 0;
                
                # strip out //
                $cmdline =~ s|//|/|og;

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index eb3933ea586d6654b72aea127792e685b325f22b..01b64372b8d4d1cf55847b76d229fea3b65e984c 100644 (file)
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -120,8 +120,11 @@ sub start
 sub normal
 {
        my ($self, $line) = @_;
-       my @field = split /[\^\~]/, $line;
+       my @field = split /\^/, $line;
+       pop @field if $field[-1] eq '~';
        
+#      print join(',', @field), "\n";
+                                               
        # ignore any lines that don't start with PC
        return if !$field[0] =~ /^PC/;
        

diff --git a/perl/cluster.pl b/perl/cluster.pl
index 706ee54861357c0a7768ba97f09f2da52fccb773..49bd016cd42a3781f365181f02a876bf93416a56 100755 (executable)
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -52,7 +52,7 @@ package main;
 
 @inqueue = ();                                 # the main input queue, an array of hashes
 $systime = 0;                                  # the time now (in seconds)
-$version = "1.17";                             # the version no of the software
+$version = "1.20";                             # the version no of the software
 $starttime = 0;                 # the starting time of the cluster   
  
 # handle disconnections