From: djk <djk>
Date: Tue, 19 Oct 1999 23:44:55 +0000 (+0000)
Subject: 1. changed help command so that it works correctly with multiple title lines.
X-Git-Tag: R_1_32~19
X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=commitdiff_plain;h=16b9415f38bf1b7eab1a9d2dc72abce9a643be09;p=spider.git

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 c39c7350..93142c22 100644
--- 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 58a68abe..30a1f602 100644
--- 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 afdd2d30..cf3dbd8b 100644
--- 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 14913eab..1ff84385 100644
--- 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 8c2e7c46..d5f56c33 100644
--- 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");