--- loncom/lonmaxima	2006/05/10 02:21:19	1.21
+++ loncom/lonmaxima	2007/02/08 10:08:02	1.25
@@ -3,7 +3,7 @@
 # The LearningOnline Network with CAPA
 # Connect to MAXIMA CAS
 #
-# $Id: lonmaxima,v 1.21 2006/05/10 02:21:19 www Exp $
+# $Id: lonmaxima,v 1.25 2007/02/08 10:08:02 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -253,13 +253,13 @@ sub make_new_child {
         for (my $i=0; $i < $MAX_CLIENTS_PER_CHILD; $i++) {
            &status('Accepting connections');
            my $client = $server->accept()     or last;
-           print $command "kill(all);reset();\n";
+           print $command "kill(all);\n";
 	   &getmaximaoutput($command);
            &sync($command);
            while (my $cmd=<$client>) {
               &status('Processing command');
               print $command &unescape($cmd);
-              my $reply=&getmaximaoutput($command);
+              my ($reply,$finished,$syntaxerr) = &getmaximaoutput($command,1);
               print $client &escape($reply)."\n";
               if ($reply=~/^Error\:/) {
                  &logthis('Died through '.$reply);
@@ -291,7 +291,7 @@ sub make_new_child {
 	my $expect=$counter.time;
 	print $command "$expect;\n";
 	while (1) {
-	    my $output=&getmaximaoutput($command);
+	    my $output=&getmaximaoutput($command,1);
 	    if (($output=~/\Q$expect\E/) || ($output=~/^Error\:/)) {
 		return;
 	    }
@@ -300,22 +300,38 @@ sub make_new_child {
 }
 
 sub getmaximaoutput {
-    my ($command)=@_;
-    my (undef,$error,undef,$output)=$command->expect(20, -re => '\(\%i\d+\)');
+    my ($command,$numcheck)=@_;
+    my $regexp = '\(\%i\d+\)';
+    if ($numcheck) {
+        if ($command->match() =~ /\(\%i(\d+)\)/) {
+            my $nextmatch = $1+1;
+            $regexp = '\(\%i'.$nextmatch.'\)';
+        }
+    }
+    my (undef,$error,undef,$output)=$command->expect(20, -re => $regexp);
     if ($error) {
        return 'Error: '.$error;
     }
+    $output =~ s/\r+//g; # Remove Windows-style linebreaks
+    my $hasoutput=0;
     my $foundoutput=0;
+    my $syntaxerr=0;
     my $realoutput='';
     foreach my $line (split(/\n/,$output)) {
        if ($line=~/\;/) { $foundoutput=1; next; }
        if (!$foundoutput) { next; }
-       my ($label)=($line=~s/^(\(\%o\d+\))//);
+       if ($line=~/^Incorrect syntax:/) { $syntaxerr = 1; next; }
+       (my $label, $line) = ($line=~ /^(\(\%o\d+\))(.+)$/);
        if ($label) {
           $label=~s/\S/ /g;
           $line=$label.$line;
+          $hasoutput = 1;
        }
        $realoutput.=$line."\n";
     }
-    return $realoutput;
+    if (wantarray) {
+        return ($realoutput,$hasoutput,$syntaxerr);
+    } else {
+        return $realoutput;
+    }
 }