diff --git a/src/main/java/org/gcube/dataanalysis/ecoengine/configuration/AlgorithmConfiguration.java b/src/main/java/org/gcube/dataanalysis/ecoengine/configuration/AlgorithmConfiguration.java index 1a7ef50..c5bbc1f 100644 --- a/src/main/java/org/gcube/dataanalysis/ecoengine/configuration/AlgorithmConfiguration.java +++ b/src/main/java/org/gcube/dataanalysis/ecoengine/configuration/AlgorithmConfiguration.java @@ -67,6 +67,7 @@ public class AlgorithmConfiguration extends LexicalEngineConfiguration implement private String configPath; private String persistencePath; private String tableSpace; + private String taskID=""; private List endpoints; @@ -204,6 +205,12 @@ public class AlgorithmConfiguration extends LexicalEngineConfiguration implement this.tableSpace = tableSpace; } + public void setTaskID(String taskID) { + this.taskID = taskID; + } + public String getTaskID() { + return taskID; + } } diff --git a/src/main/java/org/gcube/dataanalysis/ecoengine/interfaces/ComputationalAgent.java b/src/main/java/org/gcube/dataanalysis/ecoengine/interfaces/ComputationalAgent.java index f1004a9..f670d82 100644 --- a/src/main/java/org/gcube/dataanalysis/ecoengine/interfaces/ComputationalAgent.java +++ b/src/main/java/org/gcube/dataanalysis/ecoengine/interfaces/ComputationalAgent.java @@ -33,4 +33,5 @@ public interface ComputationalAgent { public void compute() throws Exception; + } diff --git a/src/main/java/org/gcube/dataanalysis/ecoengine/utils/LMEEnum.java b/src/main/java/org/gcube/dataanalysis/ecoengine/utils/LMEEnum.java index 0c0202c..cef6d16 100644 --- a/src/main/java/org/gcube/dataanalysis/ecoengine/utils/LMEEnum.java +++ b/src/main/java/org/gcube/dataanalysis/ecoengine/utils/LMEEnum.java @@ -19,7 +19,7 @@ public class LMEEnum extends DynamicEnum { en.addEnum(LMEEnumType.class, "CIAO"); en.addEnum(LMEEnumType.class, "TEST"); - en.addEnum(LMEEnumType.class, "MIAO*_$"); + en.addEnum(LMEEnumType.class, "MIAO *_$"); System.out.println(Arrays.deepToString(LMEEnumType.values())); /* diff --git a/src/main/java/org/gcube/dataanalysis/ecoengine/utils/ZipTools.java b/src/main/java/org/gcube/dataanalysis/ecoengine/utils/ZipTools.java index a85d829..9513168 100644 --- a/src/main/java/org/gcube/dataanalysis/ecoengine/utils/ZipTools.java +++ b/src/main/java/org/gcube/dataanalysis/ecoengine/utils/ZipTools.java @@ -1,9 +1,12 @@ package org.gcube.dataanalysis.ecoengine.utils; +import java.io.BufferedInputStream; +import java.io.BufferedOutputStream; import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; +import java.util.Date; import java.util.zip.ZipEntry; import java.util.zip.ZipInputStream; import java.util.zip.ZipOutputStream; @@ -12,7 +15,7 @@ import org.gcube.contentmanagement.lexicalmatcher.utils.AnalysisLogger; public class ZipTools { - public static void unZip(String zipFile, String outputFolder) throws Exception { + public static void unZip(String zipFile, String outputFolder) throws Exception { byte[] buffer = new byte[1024]; @@ -36,10 +39,11 @@ public class ZipTools { AnalysisLogger.getLogger().debug("Unzipping : " + newFile.getAbsoluteFile()); - // create all non exists folders - // else you will hit FileNotFoundException for compressed folder + if (ze.isDirectory()) + new File(outputFolder,ze.getName()).mkdir(); + + else{ new File(newFile.getParent()).mkdirs(); - FileOutputStream fos = new FileOutputStream(newFile); int len; @@ -48,6 +52,7 @@ public class ZipTools { } fos.close(); + } ze = zis.getNextEntry(); }