1. changed help command so that it works correctly with multiple title lines.

2. added to address to the list of things a message checks to see whether it
is a duplicate (how on earth did it take _this_ long to find this one?).
3. Changes S CC so that the callsign it says it has sent to is the real one.

diff --git a/Changes b/Changes
index c39c735054e70c79eaa944e41836605e1b0f45d8..93142c226cfc7b166f7cbcd6f22fb366ddc94e31 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,3 +1,12 @@
+18Oct99=======================================================================
+1. changed help command so that it works correctly with multiple title lines.
+2. added to address to the list of things a message checks to see whether it
+is a duplicate (how on earth did it take _this_ long to find this one?).
+3. Changes S CC so that the callsign it says it has sent to is the real one.
+21Sep99=======================================================================
+1. allow zero messages to be stored (request from G4PDQ)
+2. make DX more flexible and change spotter syntax to be consistant with
+sh/dx (request from K9AN)
 30Aug99=======================================================================
 1. remove -@ as well as \d from SSIDs for spots
 2. remove WEB and/or NET from the front or rear of callsigns in Prefix.pm

diff --git a/cmd/Commands_en.hlp b/cmd/Commands_en.hlp
index 58a68abe01e57381e7cc2bd885ec70ca18f2d5d2..30a1f602f0163d7c3540c80e008a92b01a88fcf4 100644 (file)
--- a/cmd/Commands_en.hlp
+++ b/cmd/Commands_en.hlp
@@ -376,8 +376,8 @@ can contain any characters but any spaces are removed (you can type in
 spaces - but they won't appear in the password). You can see the
 result with STAT/USER.
  
-=== 0^SET/QRA <locator>^Set your QRA locator
 === 9^SET/SYS_QRA <locator>^Set your cluster QRA locator
+=== 0^SET/QRA <locator>^Set your QRA locator
 Tell the system what your QRA (or Maidenhead) locator is. If you have not
 done a SET/LOCATION then your latitude and longitude will be set roughly
 correctly (assuming your locator is correct ;-). For example:-

diff --git a/cmd/help.pl b/cmd/help.pl
index afdd2d302df66cc0d14db4c1dba93ba20b3eaf0d..cf3dbd8b5a9e25a65f7e81c04bd596e060df8355 100644 (file)
--- a/cmd/help.pl
+++ b/cmd/help.pl
@@ -50,21 +50,24 @@ $line =~ s/\s+$//og;
 my $alias = CmdAlias::get_hlp($line);
 $line = $alias if $alias;
 
-my $include;
+my $state = 0;
 foreach $in (<$h>) {
        next if $in =~ /^\#/;
        chomp $in;
        if ($in =~ /^===/) {
-               $include = 0;
+           last if $state == 2;           # come out on next command
                $in =~ s/=== //;
                my ($priv, $cmd, $desc) = split /\^/, $in;
                next if $priv > $self->priv;             # ignore subcommands that are of no concern
                next unless $cmd =~ /$line/i;
                push @out, "$cmd $desc" unless $cmd =~ /-$/o;
-               $include = 1;
+               $state = 1;
                next;
        }
-       push @out, "   $in" if $include;
+       if ($state > 0) {
+           push @out, " $in";
+               $state = 2;
+       }
 }
 
 close($h);

diff --git a/cmd/send.pl b/cmd/send.pl
index 14913eab1afa6ada93f30ebe18f3242dc3782ed7..1ff843859e3d5b17cf800dc0c037dadc6d1fb5b1 100644 (file)
--- a/cmd/send.pl
+++ b/cmd/send.pl
@@ -49,8 +49,9 @@ if ($self->state eq "prompt") {
                for ($i++ ; $i < @f; $i++) {
                        my $msgno = DXMsg::next_transno('Msgno');
                        my $newsubj = "CC: " . $oref->subject;
+                       my $newcall = uc $f[$i];
                        my $nref = DXMsg->alloc($msgno, 
-                                                                       uc $f[$i], 
+                                                                       $newcall, 
                                                                        $self->call,  
                                                                        $main::systime, 
                                                                        '1',  
@@ -68,8 +69,7 @@ if ($self->state eq "prompt") {
                        push @list, $oref->read_msg_body();
                        $nref->store(\@list);
                        $nref->add_dir();
-                       push @out, $self->msg('m2', $oref->msgno, $to);
-#                      push @out, "copy of msg $oref->{msgno} sent to $to";
+                       push @out, $self->msg('m2', $oref->msgno, $newcall);
                }
                DXMsg::queue_msg();
                return (1, @out);
@@ -127,7 +127,6 @@ if ($self->state eq "prompt") {
                        }
                }
                if (grep $_ eq $t, @DXMsg::badmsg) {
-#                      push @out, "Sorry, $t is an unacceptable TO address";
                        push @out, $self->msg('m3', $t);
                } else {
                        push @to, $t;
@@ -144,7 +143,6 @@ if ($self->state eq "prompt") {
        $self->func("DXMsg::do_send_stuff");
        $self->state('send1');
        push @out, $self->msg('m1');
-       #push @out, "Enter Subject (30 characters) >";
 }
 
 return (1, @out);

diff --git a/perl/DXMsg.pm b/perl/DXMsg.pm
index 8c2e7c46aa3e3d8fb85a7ef45e3ec185e74c777e..d5f56c330a59945e944ad9b0a608bea0d0d65c7e 100644 (file)
--- a/perl/DXMsg.pm
+++ b/perl/DXMsg.pm
@@ -267,7 +267,7 @@ sub process
                                                # does an identical message already exist?
                                                my $m;
                                                for $m (@msg) {
-                                                       if ($ref->{subject} eq $m->{subject} && $ref->{t} == $m->{t} && $ref->{from} eq $m->{from}) {
+                                                       if ($ref->{subject} eq $m->{subject} && $ref->{t} == $m->{t} && $ref->{from} eq $m->{from} && $ref->{to} eq $m->{to}) {
                                                                $ref->stop_msg($self->call);
                                                                my $msgno = $m->{msgno};
                                                                dbg('msg', "duplicate message to $msgno\n");