--- loncom/lonmaxima	2007/08/02 13:04:55	1.31
+++ loncom/lonmaxima	2007/11/09 18:47:01	1.34
@@ -3,7 +3,7 @@
 # The LearningOnline Network with CAPA
 # Connect to MAXIMA CAS
 #
-# $Id: lonmaxima,v 1.31 2007/08/02 13:04:55 bisitz Exp $
+# $Id: lonmaxima,v 1.34 2007/11/09 18:47:01 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -256,7 +256,7 @@ sub make_new_child {
 
 	$command->log_stdout(0);
 	#$command->log_file("$execdir/logs/lonmaxima.session.log");
-        &getmaximaoutput($command);
+        &sync($command);
 
         for (my $i=0; $i < $MAX_CLIENTS_PER_CHILD; $i++) {
             &status('Accepting connections');
@@ -283,6 +283,7 @@ sub make_new_child {
             }
         }
 
+	print $command ("quit();\n");
         # tidy up gracefully and finish
 
         $command->soft_close();
@@ -341,18 +342,22 @@ sub getmaximaoutput {
     }
     $output =~ s/\r+//g; # Remove Windows-style linebreaks
     my $foundoutput=0;
+    my $found_label=0;
     my $realoutput='';
     foreach my $line (split(/\n/,$output)) {
        if ($line=~/\;/) { $foundoutput=1; next; }
        if (!$foundoutput) { next; }
        if ($line=~/^Incorrect syntax:/) { $syntaxerr = 1; next; }
-       if ( $line=~ /^(\(\%o\d+\))(.+)$/){
+       if ($line=~ /^(\(\%o\d+\))(.+)$/){
            my $label = $1;
            $line = $2;
            $label =~s/\S/ /g;
            $line=$label.$line;
+	   $found_label=1;
+       }
+       if ($found_label) {
+	   $realoutput.=$line."\n";
        }
-       $realoutput.=$line."\n";
     }
     if (wantarray) {
         return ($realoutput,$syntaxerr);