X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXMsg.pm;h=f9ede90c4c167f9445019e243dc346d7bd565cfc;hb=8f391050421dd665bbf5fdcb3279a6074d97a74e;hp=10dd0ef9b25d8bd268d2e39d38ba2cfb8f166d66;hpb=2b33cd180c5c6a990998ef4a7b93199702853900;p=spider.git

diff --git a/perl/DXMsg.pm b/perl/DXMsg.pm
index 10dd0ef9..f9ede90c 100644
--- a/perl/DXMsg.pm
+++ b/perl/DXMsg.pm
@@ -183,7 +183,7 @@ sub process
 
 			my $t = cltounix($f[5], $f[6]);
 			my $stream = next_transno($f[2]);
-			$f[13] = $self->call unless $f[13] && $f[13] gt ' '
+			$f[13] = $self->call unless $f[13] && $f[13] gt ' ';
 			my $ref = DXMsg->alloc($stream, uc $f[3], $f[4], $t, $f[7], $f[8], $f[13], '0', $f[11]);
 			
 			# fill in various forwarding state variables
@@ -212,6 +212,7 @@ sub process
 		if ($pcno == 29) {		# incoming text
 			my $ref = $work{"$f[2]$f[3]"};
 			if ($ref) {
+				$f[4] =~ s/\%5E/^/g;
 				push @{$ref->{lines}}, $f[4];
 				$ref->{count}++;
 				if ($ref->{count} >= $ref->{linesreq}) {
@@ -600,12 +601,12 @@ sub queue_msg
 	my $call = shift;
 	my $ref;
 	my $clref;
-	my @nodelist = DXChannel::get_all_ak1a();
 	
 	# bat down the message list looking for one that needs to go off site and whose
 	# nearest node is not busy.
 
 	dbg('msg', "queue msg ($sort)\n");
+	my @nodelist = DXChannel::get_all_nodes;
 	foreach $ref (@msg) {
 		# firstly, is it private and unread? if so can I find the recipient
 		# in my cluster node list offsite?
@@ -761,7 +762,7 @@ sub init
 
 	@msg = ();
 	for (sort @dir) {
-		next unless /^m\d+$/o;
+		next unless /^m\d\d\d\d\d\d$/;
 		
 		$ref = read_msg_header("$msgdir/$_");
 		unless ($ref) {