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

raeburn raeburn at source.lon-capa.org
Sun Nov 16 10:35:27 EST 2014


raeburn		Sun Nov 16 15:35:27 2014 EDT

  Modified files:              
    /loncom	lonr 
  Log:
  - Whitespace changes only.
    - LON-CAPA coding style: indents have four spaces.
  
  
Index: loncom/lonr
diff -u loncom/lonr:1.9 loncom/lonr:1.10
--- loncom/lonr:1.9	Sun Nov 16 02:10:41 2014
+++ loncom/lonr	Sun Nov 16 15:35:27 2014
@@ -3,7 +3,7 @@
 # The LearningOnline Network with CAPA
 # Connect to R CAS
 #
-# $Id: lonr,v 1.9 2014/11/16 02:10:41 raeburn Exp $
+# $Id: lonr,v 1.10 2014/11/16 15:35:27 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -353,10 +353,10 @@
 
     my $realoutput='';
     foreach my $line (split(/\n/,$output)) {
-       $line=~s/\s$//gs;
-       if ($line=~/^Error\:/) { $syntaxerr=1; next; }
-       if ($line=~ /\;$/) { next; }
-       if (my ($result)=($line=~/^\s*\[?\d+\,?\]?\s*(.*)/)) { $realoutput.=$result."\n"; }
+        $line=~s/\s$//gs;
+        if ($line=~/^Error\:/) { $syntaxerr=1; next; }
+        if ($line=~ /\;$/) { next; }
+        if (my ($result)=($line=~/^\s*\[?\d+\,?\]?\s*(.*)/)) { $realoutput.=$result."\n"; }
     }
     if (wantarray) {
         return ($realoutput,$syntaxerr);




More information about the LON-CAPA-cvs mailing list