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

[raeburn]

raeburn		Thu Oct 30 19:09:06 2014 EDT

  Modified files:              
    /loncom	lonr 
  Log:
  - Improved regexp for detection of end of output from a series of R commands, 
    which prevents truncation of output, after Pr(>  e.g., output from anova(). 
  
  
Index: loncom/lonr
diff -u loncom/lonr:1.6 loncom/lonr:1.7
--- loncom/lonr:1.6	Tue Jun 23 03:01:09 2009
+++ loncom/lonr	Thu Oct 30 19:09:06 2014
@@ -3,7 +3,7 @@
 # The LearningOnline Network with CAPA
 # Connect to R CAS
 #
-# $Id: lonr,v 1.6 2009/06/23 03:01:09 www Exp $
+# $Id: lonr,v 1.7 2014/10/30 19:09:06 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -329,7 +329,7 @@
 
 sub getroutput {
     my ($command)=@_;
-    my $regexp = '>';
+    my $regexp = '>\s+$';
     my $syntaxerr=0;
     my $timeout = 20;
     my (undef,$error,$matched,$output) =