[rkward-cvs] rkward/rkward/rbackend rembed.cpp,1.15,1.16 rinterface.cpp,1.19,1.20

[Thomas Friedrichsmeier]

Update of /cvsroot/rkward/rkward/rkward/rbackend
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19121

Modified Files:
	rembed.cpp rinterface.cpp 
Log Message:
Using functions to get temporary filenames and output filename. Not prone to deletion of variables

Index: rinterface.cpp
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/rbackend/rinterface.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** rinterface.cpp	21 Apr 2005 22:10:57 -0000	1.19
--- rinterface.cpp	28 Apr 2005 20:05:09 -0000	1.20
***************
*** 222,225 ****
--- 222,229 ----
  			issueCommand (".rk.rkreply <- \"Too few arguments in call to get.tempfile.name.\"", RCommand::App | RCommand::Sync, "", 0, 0, request->in_chain);
  		}
+ 	} else if (call == "get.output.html.file") {
+ 		QDir dir (RKSettingsModuleLogfiles::filesPath ());
+ 		// TODO: make more generic, get filename sanely
+ 		issueCommand (".rk.rkreply <- \"" + dir.filePath ("rk_out.html") + "\"", RCommand::App | RCommand::Sync, "", 0, 0, request->in_chain);
  	} else if (call == "sync") {
  		RObject *obj = 0;

Index: rembed.cpp
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/rbackend/rembed.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** rembed.cpp	15 Apr 2005 17:24:57 -0000	1.15
--- rembed.cpp	28 Apr 2005 20:05:09 -0000	1.16
***************
*** 84,91 ****
  	if (error) status |= SinkFail;
  	
- 	runCommandInternal (".rk.output.file <- \"" +RKSettingsModuleLogfiles::filesPath() + "/rk_out.html\"", &error);
- 	runCommandInternal (".HTML.file <- \"" +RKSettingsModuleLogfiles::filesPath() + "/rk_out.html\"", &error);
- 	runCommandInternal (".rk.output.path <- \"" +RKSettingsModuleLogfiles::filesPath() + "\"", &error);
- 	
  	outfile_offset = 0;
  	errfile_offset = 0;
--- 84,87 ----