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

[albertel]

albertel		Fri Aug  3 14:18:10 2007 EDT

  Modified files:              
    /loncom	lonmaxima 
  Log:
  - ingores all output up to the first output label, then grabs all output from there on out.
  
  
  
Index: loncom/lonmaxima
diff -u loncom/lonmaxima:1.31 loncom/lonmaxima:1.32
--- loncom/lonmaxima:1.31	Thu Aug  2 09:04:55 2007
+++ loncom/lonmaxima	Fri Aug  3 14:18:05 2007
@@ -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.32 2007/08/03 18:18:05 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -341,18 +341,22 @@
     }
     $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);