X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXMsg.pm;h=d5a168e7ced7e20120d5e44af2493fdfcf07b1ce;hb=eb944656dcd2b715338ea025fbad11e918506e26;hp=dbcd8097bafce544231a37f7e58565f55999e3c3;hpb=42846321acd959aa93c2c2afd2b1f0a67f8accaf;p=spider.git

diff --git a/perl/DXMsg.pm b/perl/DXMsg.pm
index dbcd8097..d5a168e7 100644
--- a/perl/DXMsg.pm
+++ b/perl/DXMsg.pm
@@ -788,14 +788,15 @@ sub for_me
 {
 	my $call = uc shift;
 	my $ref;
+	my $count;
 	
 	foreach $ref (@msg) {
 		# is it for me, private and unread? 
 		if ($ref->{to} eq $call && $ref->{private}) {
-			return 1 if !$ref->{'read'};
+		   $count++ unless $ref->{'read'} || $ref->{delete};
 		}
 	}
-	return 0;
+	return $count;
 }
 
 # start the message off on its travels with a PC28
@@ -1091,9 +1092,25 @@ sub do_send_stuff
 				Log('msg', "line: $line");
 				$loc->{reject}++;
 			}
+
+			if ($loc->{lines} && @{$loc->{lines}}) {
+				push @{$loc->{lines}}, length($line) > 0 ? $line : " ";
+			} else {
+				# temporarily store any R: lines so that we end up with 
+				# only the first and last ones stored.
+				if ($line =~ m|^R:\d{6}/\d{4}|) {
+					push @{$loc->{tempr}}, $line;
+				} else {
+					if (exists $loc->{tempr}) {
+						push @{$loc->{lines}}, shift @{$loc->{tempr}};
+						push @{$loc->{lines}}, pop @{$loc->{tempr}} if @{$loc->{tempr}};
+						delete $loc->{tempr};
+					}
+					push @{$loc->{lines}}, length($line) > 0 ? $line : " ";
+				} 
+			}
 			
 			# i.e. it ain't and end or abort, therefore store the line
-			push @{$loc->{lines}}, length($line) > 0 ? $line : " ";
 		}
 	}
 	return @out;