gCubeSystem
/
RConnector
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/branches/data-analysis/RConnector/2.1@146364 82a268e6-3cf1-43bd-a215-b396298e98cf

This commit is contained in:
Lucio Lelii 2017-03-27 14:35:04 +00:00
parent 2dc8b8c41a
commit 8d29e5f8ea
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
distro/changelog.xml
View File

@ -1,6 +1,9 @@
<ReleaseNotes>
<Changeset component="org.gcube.data-analysis.r-connector.2.1.2" date="2017-03-27">
<Change>add user script is executed also when configfile.csv is not present</Change>
</Changeset>
<Changeset component="org.gcube.data-analysis.r-connector.2.1.2" date="2017-02-22">
<Change>porting to tabular-data-cl 2.0.0</Change>
<Change>porting to tabualr-data-cl 2.0.0</Change>
</Changeset>
<Changeset component="org.gcube.data-analysis.r-connector.2.1.0" date="2016-10-03">
<Change>porting to smartgears 2.0</Change>

2
pom.xml
View File

@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.gcube.data.analysis</groupId>
<artifactId>r-connector</artifactId>
<version>2.1.2-SNAPSHOT</version>
<version>2.1.3-SNAPSHOT</version>
<name>RConnector</name>
<description>makes R available in the infrastructure</description>

6
src/main/java/org/gcube/data/analysis/rconnector/ConfigFileWriter.java
View File

@ -22,12 +22,12 @@ public class ConfigFileWriter {
usersHome=usersHome+"/";
File userDir = new File(usersHome+login);
File configFile= new File(userDir, fileName);
checkDirectory(userDir, login, scriptToExecute);
checkDirectory(userDir, login, scriptToExecute, configFile);
return writeFile(info, configFile);
}
private void checkDirectory(File userDir, String login, String scriptToExecute){
if ((!userDir.isDirectory() || !userDir.exists()))
private void checkDirectory(File userDir, String login, String scriptToExecute, File configFile){
if ((!userDir.isDirectory() || !userDir.exists()) || !configFile.exists() )
executeCommandLine(scriptToExecute,login);
}

1
src/main/java/org/gcube/data/analysis/rconnector/DisconnectResource.java
View File

@ -22,7 +22,6 @@ public class DisconnectResource {
@Produces(MediaType.TEXT_HTML)
public Response disconnect(@Context HttpServletRequest req) {
log.info("disconnect called ");
new Throwable().printStackTrace();
String rStudioServerAddress = context==null?"":context.getInitParameter("rStudioAddress");
log.info(rStudioServerAddress);
try{