[LON-CAPA-cvs] cvs: loncom / lonmaxima

[droeschl]

droeschl		Thu Feb 16 19:54:06 2012 EDT

  Modified files:              
    /loncom	lonmaxima 
  Log:
  In case of a syntax error maxima 5.23 outputs "incorrect syntax" instead of the uppercase "Incorrect syntax" from previous versions. 
  
  
Index: loncom/lonmaxima
diff -u loncom/lonmaxima:1.40 loncom/lonmaxima:1.41
--- loncom/lonmaxima:1.40	Fri Apr 17 00:12:14 2009
+++ loncom/lonmaxima	Thu Feb 16 19:54:06 2012
@@ -3,7 +3,7 @@
 # The LearningOnline Network with CAPA
 # Connect to MAXIMA CAS
 #
-# $Id: lonmaxima,v 1.40 2009/04/17 00:12:14 www Exp $
+# $Id: lonmaxima,v 1.41 2012/02/16 19:54:06 droeschl Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -335,17 +335,17 @@
        	if ($numcheck eq 2) {
 	    # command was the killall so should get a full reset on
 	    # command numbers
-	    $regexp = '(\(\%i(1)\)|Incorrect syntax\:)';
+	    $regexp = '(\(\%i(1)\)|[Ii]ncorrect syntax\:)';
 	} elsif ($command->match() =~ /\(\%i(\d+)\)/) {
             my $nextmatch = $1+1;
-            $regexp = '(\(\%i'.$nextmatch.'\)|Incorrect syntax\:)';
+            $regexp = '(\(\%i'.$nextmatch.'\)|[Ii]ncorrect syntax\:)';
         }
     }
     my $timeout = 20;
     my (undef,$error,$matched,$output) =
 	$command->expect($timeout, -re => $regexp);
 
-    if ($numcheck && $matched eq 'Incorrect syntax:') {
+    if ($numcheck && lc($matched) eq 'incorrect syntax:') {
 	$syntaxerr = 1;
 	if (wantarray) {
 	    return ($matched,$syntaxerr);
@@ -363,7 +363,7 @@
     foreach my $line (split(/\n/,$output)) {
        if ($line=~/\;/) { $foundoutput=1; next; }
        if (!$foundoutput) { next; }
-       if ($line=~/^Incorrect syntax:/) { $syntaxerr = 1; next; }
+       if ($line=~/^[Ii]ncorrect syntax:/) { $syntaxerr = 1; next; }
        if ($line=~ /^(\(\%o\d+\))(.+)$/){
            my $label = $1;
            $line = $2;