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

[www]

www		Fri Apr 17 00:12:14 2009 EDT

  Modified files:              
    /loncom	lonmaxima 
  Log:
  Deal with multiline output
  
  
Index: loncom/lonmaxima
diff -u loncom/lonmaxima:1.39 loncom/lonmaxima:1.40
--- loncom/lonmaxima:1.39	Tue Aug 19 10:59:10 2008
+++ loncom/lonmaxima	Fri Apr 17 00:12:14 2009
@@ -3,7 +3,7 @@
 # The LearningOnline Network with CAPA
 # Connect to MAXIMA CAS
 #
-# $Id: lonmaxima,v 1.39 2008/08/19 10:59:10 riegler Exp $
+# $Id: lonmaxima,v 1.40 2009/04/17 00:12:14 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -356,7 +356,7 @@
     if ($error) {
 	return 'Error: '.$error;
     }
-    $output =~ s/\r+//g; # Remove Windows-style linebreaks
+    $output =~ s/\r+//gs; # Remove Windows-style linebreaks
     my $foundoutput=0;
     my $found_label=0;
     my $realoutput='';