diff --git a/pom.xml b/pom.xml index dbe1f57..e1cde41 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ org.gcube.dataanalysis ecological-engine-geospatial-extensions - 1.3.8-SNAPSHOT + 1.3.9-SNAPSHOT ecological-engine-geospatial-extension library ecological-engine-geospatial-extension diff --git a/src/main/java/org/gcube/dataanalysis/geo/algorithms/RasterDataPublisher.java b/src/main/java/org/gcube/dataanalysis/geo/algorithms/RasterDataPublisher.java index bcfdc08..d219142 100644 --- a/src/main/java/org/gcube/dataanalysis/geo/algorithms/RasterDataPublisher.java +++ b/src/main/java/org/gcube/dataanalysis/geo/algorithms/RasterDataPublisher.java @@ -104,6 +104,8 @@ public class RasterDataPublisher extends StandardLocalExternalAlgorithm{ addOutputString("File name created in the e-Infrastructure", fileName); addOutputString("Map creator", username); } + AnalysisLogger.getLogger().debug("Deleting raster file "+newf.getAbsolutePath()); + newf.delete(); status = 100; } diff --git a/src/main/java/org/gcube/dataanalysis/geo/batch/GeothermalDataMetadataInsertDev.java b/src/main/java/org/gcube/dataanalysis/geo/batch/GeothermalDataMetadataInsertDev.java index b5ff477..f458c8d 100644 --- a/src/main/java/org/gcube/dataanalysis/geo/batch/GeothermalDataMetadataInsertDev.java +++ b/src/main/java/org/gcube/dataanalysis/geo/batch/GeothermalDataMetadataInsertDev.java @@ -26,7 +26,7 @@ public class GeothermalDataMetadataInsertDev { //Temperature map at 3 km depth public static void main(String[] args) throws Exception{ - /* + TemperatureIsolineat3kmdepth(); SurfaceHeatFlowMapofItaly(); TemperatureIsolineat2kmdepth(); @@ -38,7 +38,7 @@ public class GeothermalDataMetadataInsertDev { Energy(); Licenses(); - */ + Industry(); TrainingCenter(); } diff --git a/src/main/java/org/gcube/dataanalysis/geo/batch/GeothermalDataMetadataInsertSlovenia.java b/src/main/java/org/gcube/dataanalysis/geo/batch/GeothermalDataMetadataInsertSlovenia.java index d7711c1..a1a3c02 100644 --- a/src/main/java/org/gcube/dataanalysis/geo/batch/GeothermalDataMetadataInsertSlovenia.java +++ b/src/main/java/org/gcube/dataanalysis/geo/batch/GeothermalDataMetadataInsertSlovenia.java @@ -5,12 +5,12 @@ import org.opengis.metadata.identification.TopicCategory; public class GeothermalDataMetadataInsertSlovenia { - //static String geonetworkurl = "http://geonetwork.geothermaldata.d4science.org/geonetwork"; - static String geonetworkurl = "http://geoserver-dev2.d4science-ii.research-infrastructures.eu/geonetwork"; + static String geonetworkurl = "http://geonetwork.geothermaldata.d4science.org/geonetwork"; +// static String geonetworkurl = "http://geoserver-dev2.d4science-ii.research-infrastructures.eu/geonetwork"; static String geoserverurl = "http://geoserver-dev.d4science-ii.research-infrastructures.eu/geoserver"; static String user = "admin"; - //static String password = "d4science2014"; - static String password = "admin"; + static String password = "d4science2014"; +// static String password = "admin"; public static void main(String[] args) throws Exception{ for (int i=0;i