diff --git a/src/main/java/org/gcube/dataharvest/AccountingDataHarvesterPlugin.java b/src/main/java/org/gcube/dataharvest/AccountingDataHarvesterPlugin.java index 35aacb7..2a852cc 100644 --- a/src/main/java/org/gcube/dataharvest/AccountingDataHarvesterPlugin.java +++ b/src/main/java/org/gcube/dataharvest/AccountingDataHarvesterPlugin.java @@ -7,7 +7,9 @@ import java.util.Date; import java.util.List; import java.util.Map; import java.util.Properties; +import java.util.Set; import java.util.SortedSet; +import java.util.TreeSet; import org.gcube.dataharvest.dao.DatabaseManager; import org.gcube.dataharvest.datamodel.HarvestedData; @@ -40,8 +42,8 @@ public class AccountingDataHarvesterPlugin extends Plugin soBigDataContexts = getSoBigDataContexts(contexts, SO_BIG_DATA_CONTEXT + "/"); + try { // Collecting info on Resource Catalogue (Dataset, Application, Deliverables, Methods) ResourceCatalogueHarvester resourceCatalogueHarvester = new ResourceCatalogueHarvester(start, end); + resourceCatalogueHarvester.setContexts(contexts); List harvested = resourceCatalogueHarvester.getData(); data.addAll(harvested); } catch(Exception e) { @@ -171,6 +177,7 @@ public class AccountingDataHarvesterPlugin extends Plugin harvested = dataMethodDownloadHarvester.getData(); data.addAll(harvested); } catch(Exception e) { @@ -207,6 +214,17 @@ public class AccountingDataHarvesterPlugin extends Plugin getSoBigDataContexts(Set contexts, String base){ + SortedSet filteredContext = new TreeSet<>(); + for(String context : contexts) { + if(context.startsWith(SO_BIG_DATA_CONTEXT)){ + filteredContext.add(context); + } + } + return filteredContext; + } + /** {@inheritDoc} */ @Override protected void onStop() throws Exception { diff --git a/src/main/java/org/gcube/dataharvest/harvester/sobigdata/SoBigDataHarvester.java b/src/main/java/org/gcube/dataharvest/harvester/sobigdata/SoBigDataHarvester.java index b6579e5..3efa420 100644 --- a/src/main/java/org/gcube/dataharvest/harvester/sobigdata/SoBigDataHarvester.java +++ b/src/main/java/org/gcube/dataharvest/harvester/sobigdata/SoBigDataHarvester.java @@ -2,23 +2,23 @@ package org.gcube.dataharvest.harvester.sobigdata; import java.text.ParseException; import java.util.Date; -import java.util.List; +import java.util.SortedSet; import org.gcube.dataharvest.harvester.BasicHarvester; public abstract class SoBigDataHarvester extends BasicHarvester { - protected List contexts; + protected SortedSet contexts; public SoBigDataHarvester(Date start, Date end) throws ParseException { super(start, end); } - public List getContexts() { + public SortedSet getContexts() { return contexts; } - public void setContexts(List contexts) { + public void setContexts(SortedSet contexts) { this.contexts = contexts; }