diff --git a/.classpath b/.classpath
index 5adac7b..007e981 100644
--- a/.classpath
+++ b/.classpath
@@ -6,11 +6,6 @@
-
-
-
-
-
@@ -22,5 +17,10 @@
+
+
+
+
+
diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
index 9feff45..e9441bb 100644
--- a/.settings/org.eclipse.core.resources.prefs
+++ b/.settings/org.eclipse.core.resources.prefs
@@ -1,4 +1,3 @@
-#Tue Mar 19 10:56:09 CET 2013
-eclipse.preferences.version=1
-encoding//src/main/java=UTF-8
-encoding/=UTF-8
+eclipse.preferences.version=1
+encoding//src/main/java=UTF-8
+encoding/=UTF-8
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
index 21e88bc..6249222 100644
--- a/.settings/org.eclipse.jdt.core.prefs
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -1,13 +1,12 @@
-#Tue Mar 19 10:56:09 CET 2013
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.6
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/pom.xml b/pom.xml
index 3d2b87c..b998d4c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
org.gcube.dataanalysis
ecological-engine-external-algorithms
- 1.1.1-SNAPSHOT
+ 1.1.3
ecological-engine-external-algorithms
ecological-engine-external-algorithms library
@@ -19,7 +19,7 @@
org.gcube.dataanalysis
ecological-engine
- 1.7.1-SNAPSHOT
+ [1.0.0-SNAPSHOT, 3.0.0-SNAPSHOT)
rapidminer-custom
@@ -31,6 +31,11 @@
postgresql
8.4-702.jdbc4
+
+ rapidminer-custom
+ gsay-service
+ 1.0.0
+
org.gcube.core
common-gcore-stubs
@@ -69,7 +74,6 @@
org.gcube.data.spd
spd-client-library
[3.0.0-SNAPSHOT, 4.0.0-SNAPSHOT)
- provided
@@ -79,10 +83,6 @@
2.9.1
provided
-
-
-
-
org.gcube.data.spd
spql-parser
@@ -93,53 +93,45 @@
org.gcube.common
csv4j
- [1.1.0-SNAPSHOT, 2.0.0-SNAPSHOT)
+ [1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)
provided
org.gcube.data.spd
spd-model
- [1.0.0-SNAPSHOT, 3.0.0-SNAPSHOT)
-
-
- provided
+ [1.0.0-SNAPSHOT, 4.0.0-SNAPSHOT)
- org.gcube.resources.discovery
- discovery-client
- [1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)
- provided
+ org.gcube.resources.discovery
+ discovery-client
+ [1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)
+ provided
- org.gcube.core
- common-clients
- [2.0.0-SNAPSHOT,3.0.0-SNAPSHOT)
+ org.gcube.core
+ common-clients
+ [2.0.0-SNAPSHOT,3.0.0-SNAPSHOT)
- org.gcube.core
- common-gcore-clients
- [1.0.0-SNAPSHOT,3.0.0-SNAPSHOT)
+ org.gcube.core
+ common-gcore-clients
+ [1.0.0-SNAPSHOT,3.0.0-SNAPSHOT)
-
-
-
-
-
-
+
- org.gcube.resources.discovery
- ic-client
- [1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)
+ org.gcube.resources.discovery
+ ic-client
+ [1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)
- org.gcube.core
- common-scope-maps
- [1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)
+ org.gcube.core
+ common-scope-maps
+ [1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)
@@ -155,8 +147,8 @@
maven-compiler-plugin
-
- 1.6
+
+ 1.7
diff --git a/src/main/java/org/gcube/dataanalysis/JobSMspd/Lock.java b/src/main/java/org/gcube/dataanalysis/JobSMspd/Lock.java
new file mode 100644
index 0000000..35096e8
--- /dev/null
+++ b/src/main/java/org/gcube/dataanalysis/JobSMspd/Lock.java
@@ -0,0 +1,19 @@
+package org.gcube.dataanalysis.JobSMspd;
+
+public class Lock{
+
+ private boolean isLocked = false;
+
+ public synchronized void lock()
+ throws InterruptedException{
+ while(isLocked){
+ wait();
+ }
+ isLocked = true;
+ }
+
+ public synchronized void unlock(){
+ isLocked = false;
+ notify();
+ }
+ }
diff --git a/src/main/java/org/gcube/dataanalysis/JobSMspd/MapDwCA.java b/src/main/java/org/gcube/dataanalysis/JobSMspd/MapDwCA.java
index 53dcf05..f92d3f3 100644
--- a/src/main/java/org/gcube/dataanalysis/JobSMspd/MapDwCA.java
+++ b/src/main/java/org/gcube/dataanalysis/JobSMspd/MapDwCA.java
@@ -186,8 +186,8 @@ public class MapDwCA {
file.write("\t");
//scientificNameAuthorship
- if (taxonomyItem.getAuthor()!= null)
- file.write(taxonomyItem.getAuthor());
+ if (taxonomyItem.getScientificNameAuthorship()!= null)
+ file.write(taxonomyItem.getScientificNameAuthorship());
file.write("\t");
if (taxonomyItem.getCitation()!= null)
diff --git a/src/main/java/org/gcube/dataanalysis/JobSMspd/OccurencesProcedure.java b/src/main/java/org/gcube/dataanalysis/JobSMspd/OccurencesProcedure.java
index 176fda8..1fbf2d9 100644
--- a/src/main/java/org/gcube/dataanalysis/JobSMspd/OccurencesProcedure.java
+++ b/src/main/java/org/gcube/dataanalysis/JobSMspd/OccurencesProcedure.java
@@ -2,17 +2,16 @@ package org.gcube.dataanalysis.JobSMspd;
import static org.gcube.data.spd.client.plugins.AbstractPlugin.manager;
+import java.io.BufferedReader;
import java.io.BufferedWriter;
import java.io.File;
+import java.io.FileInputStream;
import java.io.FileWriter;
import java.io.IOException;
+import java.io.InputStreamReader;
import java.io.PrintWriter;
import java.io.StringWriter;
import java.lang.reflect.Field;
-import java.sql.Connection;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.LinkedHashMap;
@@ -26,9 +25,6 @@ import org.gcube.data.spd.client.proxies.Manager;
import org.gcube.data.spd.model.Conditions;
import org.gcube.data.spd.model.PluginDescription;
import org.gcube.data.spd.model.util.Capabilities;
-import org.gcube.dataanalysis.JobSMspd.TaxaProcedure.DataPenum;
-import org.gcube.dataanalysis.JobSMspd.TaxaProcedure.ExtentionDPEnum;
-import org.gcube.dataanalysis.JobSMspd.TaxaProcedure.UnfoldDPEnum;
import org.gcube.dataanalysis.ecoengine.configuration.AlgorithmConfiguration;
import org.gcube.dataanalysis.ecoengine.datatypes.ColumnTypesList;
import org.gcube.dataanalysis.ecoengine.datatypes.DatabaseType;
@@ -56,10 +52,10 @@ public class OccurencesProcedure extends StandardLocalExternalAlgorithm {
SessionFactory dbconnection = null;
// public static boolean call=false;
String tablename;
+ File outputResult;
String columnnames;
- List