Changeset 336cc01 in tol

Timestamp:

Mar 20, 2009, 5:09:00 PM (18 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

33f9c7a

Parents:

d9a156c

Message:

Avoiding duplicate / in paths

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@795 be4846ae-f051-483a-831f-b64e7d08527f

File:

• tol/stdlib/math/R/Rapi.tol (modified) (4 diffs)

tol/stdlib/math/R/Rapi.tol

@@ -25 +25 @@
   Text _R.cmd = "R CMD BATCH --vanilla";
   Text _tmpdir = Replace(TmpDir, "\\", "/");
-  Text _cwd = GetAbsolutePath(".");
-  Text _TOLutils.R = _cwd+"/"+ "TOLutils.R";
-  Text _tmp.in.R = _tmpdir+"/"+"in%S.R";
-  Text _tmp.R.out = _tmpdir+"/"+"Rout%S.log";
-  Text _tmp.args.R = _tmpdir+"/"+"args%S.R";
+  Text _cwd = GetAbsolutePath("./");
+  Text _TOLutils.R = _cwd+ "TOLutils.R";
+  Text _tmp.in.R = _tmpdir+"in%S.R";
+  Text _tmp.R.out = _tmpdir+"Rout%S.log";
+  Text _tmp.args.R = _tmpdir+"args%S.R";
 
   //////////////////////////////////////////////////////////////////////////////
@@ -176 +176 @@
   //////////////////////////////////////////////////////////////////////////////
   {
+    Text _MID = "[Rapi::RunRScript] ";
     Text rndID = _randID(0);
     
@@ -194 +195 @@
       });
       
-   Text _script  = "source('"+_TOLutils.R+"'); "+
+    Text _script  = "source('"+_TOLutils.R+"'); "+
      ReplaceTable(script,  [[ [["%S", rndID]], [["%A", args.R]] ]]);
 
@@ -203 +204 @@
     Text R.out = Replace(_tmp.R.out, "%S", rndID);
 
-    Text oscmd = _R.cmd+" "+in.R+" "+R.out;
+    Text oscmd = _R.cmd+" \""+in.R+"\" \""+R.out+"\"";
     If (verbose,
-        WriteLn("[Rapi::RunRScript] Executing :\n<"+oscmd));
+        WriteLn(_MID+"Executing :\n<"+oscmd));
     Real OSCmdWait(oscmd);
     If (verbose,
-        WriteLn("[Rapi:RunRScript] R output was :\n<"+ReadFile(R.out)));
+        WriteLn(_MID+"R output was :\n<"+ReadFile(R.out)));
 
     // Remove remporaly results