From 4feeab85a5efe5148af8308f91e1ba17a9b356a6 Mon Sep 17 00:00:00 2001 From: rldhont Date: Thu, 15 Sep 2016 11:15:11 +0200 Subject: [PATCH] [Processing][Rscripts] Use temp script filename The build RScript is stored in the User folder, so the script is erased at each RAlgorithm execute. Server side or for debugging this could be a problem. So processing_script.r will be stored in temp folder. --- python/plugins/processing/algs/r/RUtils.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/python/plugins/processing/algs/r/RUtils.py b/python/plugins/processing/algs/r/RUtils.py index 3fee8f5dffd..d5c44cb7222 100644 --- a/python/plugins/processing/algs/r/RUtils.py +++ b/python/plugins/processing/algs/r/RUtils.py @@ -45,6 +45,8 @@ class RUtils(object): R_USE64 = 'R_USE64' R_LIBS_USER = 'R_LIBS_USER' + rscriptfilename = userFolder() + os.sep + 'processing_script.r' + @staticmethod def RFolder(): folder = ProcessingConfig.getSetting(RUtils.R_FOLDER) @@ -108,7 +110,7 @@ class RUtils(object): @staticmethod def getRScriptFilename(): - return userFolder() + os.sep + 'processing_script.r' + return RUtils.rscriptfilename @staticmethod def getConsoleOutputFilename(): @@ -116,6 +118,9 @@ class RUtils(object): @staticmethod def executeRAlgorithm(alg, progress): + # generate new R script file name in a temp folder + RUtils.rscriptfilename = getTempFilenameInTempFolder('processing_script.r') + # run commands RUtils.verboseCommands = alg.getVerboseCommands() RUtils.createRScriptFromRCommands(alg.getFullSetOfRCommands()) if isWindows():