gCubeSystem
/
statistical-algorithms-importer
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Minor Update 

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/statistical-algorithms-importer@167474 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Giancarlo Panichi 2018-05-14 15:36:01 +00:00
parent e3438dab75
commit d323fe7cb8
5 changed files with 45 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.classpath
View File

@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" output="target/statistical-algorithms-importer-1.10.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
<classpathentry kind="src" output="target/statistical-algorithms-importer-1.11.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry excluding="**" kind="src" output="target/statistical-algorithms-importer-1.10.0-SNAPSHOT/WEB-INF/classes" path="src/main/resources">
<classpathentry excluding="**" kind="src" output="target/statistical-algorithms-importer-1.11.0-SNAPSHOT/WEB-INF/classes" path="src/main/resources">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
@ -45,5 +45,5 @@
</classpathentry>
<classpathentry kind="lib" path="/home/giancarlo/gwt/gwt-2.6.1/validation-api-1.0.0.GA.jar" sourcepath="/home/giancarlo/gwt/gwt-2.6.1/validation-api-1.0.0.GA-sources.jar"/>
<classpathentry kind="lib" path="/home/giancarlo/gwt/gwt-2.6.1/validation-api-1.0.0.GA-sources.jar"/>
<classpathentry kind="output" path="target/statistical-algorithms-importer-1.10.0-SNAPSHOT/WEB-INF/classes"/>
<classpathentry kind="output" path="target/statistical-algorithms-importer-1.11.0-SNAPSHOT/WEB-INF/classes"/>
</classpath>

3
distro/changelog.xml
View File

@ -1,4 +1,7 @@
<ReleaseNotes>
<Changeset component="${groupId}.${artifactId}.1-11-0" date="2018-06-01">
<Change>Added Status control in Algorithm Generator [ticket #11750]</Change>
</Changeset>
<Changeset component="${groupId}.${artifactId}.1-10-0" date="2018-01-12">
<Change>Added support to Private algorithms [ticket #10779]</Change>
<Change>Added user name to algorithms descriptions in SAI publication

2
pom.xml
View File

@ -13,7 +13,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.gcube.portlets.user</groupId>
<artifactId>statistical-algorithms-importer</artifactId>
<version>1.10.0-SNAPSHOT</version>
<version>1.11.0-SNAPSHOT</version>
<packaging>war</packaging>

39
src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/server/generator/AlgorithmGenerator.java
View File

@ -74,7 +74,7 @@ public class AlgorithmGenerator {
ArrayList<String> code = new ArrayList<>();
code.addAll(Arrays.asList("package org.gcube.dataanalysis.executor.rscripts;", "", "import java.io.File;",
"import java.util.ArrayList;", "import java.util.LinkedHashMap;",
"import java.nio.file.Files;", "import java.util.ArrayList;", "import java.util.LinkedHashMap;",
"import org.gcube.dataanalysis.ecoengine.datatypes.PrimitiveType;",
"import org.gcube.dataanalysis.ecoengine.datatypes.StatisticalType;",
"import org.gcube.dataanalysis.ecoengine.datatypes.enumtypes.PrimitiveTypes;",
@ -274,6 +274,9 @@ public class AlgorithmGenerator {
" PrimitiveType o = new PrimitiveType(LinkedHashMap.class.getName(), output, PrimitiveTypes.MAP, \"Output\", \"\");");
code.add(" return o;");
code.add(" }");
//createStatusCode(code);
code.add("}");
return code;
}
@ -345,7 +348,7 @@ public class AlgorithmGenerator {
String[] values = selVariable.getDefaultValue().split("\\|");
if (values.length > 0) {
// TODO
//
String nameEnum = enumUUID.get("opIO" + selVariable.getId());
code.add(" if (org.gcube.dataanalysis.executor.rscripts."
@ -480,5 +483,37 @@ public class AlgorithmGenerator {
}
return packageUrl;
}
/*
private void createStatusCode(ArrayList<String> code) {
code.add("");
code.add(" @Override");
code.add(" public float getStatus() {");
code.add(" try {");
code.add(" String scriptSubfolder = \"\";");
code.add(" System.out.println(\"Status MainScriptName: \"+mainScriptName);");
code.add(" int idx = mainScriptName.lastIndexOf(\"/\");");
code.add(" if (idx > -1)");
code.add(" scriptSubfolder = mainScriptName.substring(0, idx);");
code.add(" System.out.println(\"Status ScriptSubfolder: \"+scriptSubfolder);");
code.add(" File statusFile = new File(config.getConfigPath(), scriptSubfolder + ");
code.add(" \"/status.txt\");");
code.add(" System.out.println(\"Status file exists: \"+statusFile.exists());");
code.add(" System.out.println(\"Status file AbsolutePath: \"+statusFile.getAbsolutePath());");
code.add(" System.out.println(\"Status file Path: \"+statusFile.toPath());");
code.add(" if (statusFile.exists()) {");
code.add(" status = Float.parseFloat(Files.readAllLines(statusFile.toPath()).get(0));");
code.add(" }");
code.add(" } catch (Exception e) {");
code.add("");
code.add(" }");
code.add(" System.out.println(\"Status Value: \"+status);");
code.add(" return status;");
code.add(" }");
code.add("");
}
*/
}

2
src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/server/social/AlgorithmNotification.java
View File

@ -225,7 +225,7 @@ public class AlgorithmNotification extends Thread {
URL urlObj = new URL(requestUrl);
HttpURLConnection connection = (HttpURLConnection) urlObj.openConnection();
connection.addRequestProperty("Content-Type", "application/json");
connection.addRequestProperty("Content-Type", "application/json; charset=UTF-8");
connection.setRequestMethod("POST");
connection.setDoInput(true);
connection.setDoOutput(true);