From 302d29a607b27000b02cb249d4d5ab0667e84385 Mon Sep 17 00:00:00 2001 From: "luca.frosini" Date: Mon, 21 May 2018 12:06:27 +0000 Subject: [PATCH] git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-dashboard-harvester-se-plugin@167640 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../sobigdata/DataMethodDownloadHarvester.java | 1 - .../sobigdata/ResourceCatalogueHarvester.java | 15 ++------------- .../harvester/sobigdata/SoBigDataHarvester.java | 11 +++++++++++ 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/src/main/java/org/gcube/dataharvest/harvester/sobigdata/DataMethodDownloadHarvester.java b/src/main/java/org/gcube/dataharvest/harvester/sobigdata/DataMethodDownloadHarvester.java index 040d5f5..2a5b471 100644 --- a/src/main/java/org/gcube/dataharvest/harvester/sobigdata/DataMethodDownloadHarvester.java +++ b/src/main/java/org/gcube/dataharvest/harvester/sobigdata/DataMethodDownloadHarvester.java @@ -17,7 +17,6 @@ import org.gcube.common.homelibrary.jcr.repository.JCRRepository; import org.gcube.common.homelibrary.jcr.workspace.JCRWorkspace; import org.gcube.common.homelibrary.jcr.workspace.JCRWorkspaceItem; import org.gcube.dataharvest.datamodel.HarvestedData; -import org.gcube.dataharvest.harvester.BasicHarvester; import org.gcube.dataharvest.utils.DateUtils; import org.gcube.dataharvest.utils.Utils; import org.slf4j.Logger; diff --git a/src/main/java/org/gcube/dataharvest/harvester/sobigdata/ResourceCatalogueHarvester.java b/src/main/java/org/gcube/dataharvest/harvester/sobigdata/ResourceCatalogueHarvester.java index c3e0531..4649c90 100644 --- a/src/main/java/org/gcube/dataharvest/harvester/sobigdata/ResourceCatalogueHarvester.java +++ b/src/main/java/org/gcube/dataharvest/harvester/sobigdata/ResourceCatalogueHarvester.java @@ -29,8 +29,6 @@ public class ResourceCatalogueHarvester extends SoBigDataHarvester { private int societalDebatesCounter = 0; private int wellBeingAndEconomyCounter = 0; - protected List contexts; - protected String solrBaseUrl; public ResourceCatalogueHarvester(Date start, Date end) throws ParseException { @@ -38,16 +36,7 @@ public class ResourceCatalogueHarvester extends SoBigDataHarvester { } protected String getSolrBaseUrl() { - return null; - } - - - public List getContexts() { - return contexts; - } - - public void setContexts(List contexts) { - this.contexts = contexts; + return "https://ckan-solr-d4s.d4science.org/solr/sobigdata"; } @Override @@ -158,7 +147,7 @@ public class ResourceCatalogueHarvester extends SoBigDataHarvester { private String executeQuery(String fqSubString) throws Exception { - String query = "https://ckan-solr-d4s.d4science.org/solr/sobigdata/select?"; + String query = getSolrBaseUrl() + "select?"; String q = UrlEncoderUtil.encodeQuery("metadata_created:[" + DateUtils.dateToStringWithTZ(startDate) + " TO " + DateUtils.dateToStringWithTZ(endDate) + "]"); 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 69e8c11..b6579e5 100644 --- a/src/main/java/org/gcube/dataharvest/harvester/sobigdata/SoBigDataHarvester.java +++ b/src/main/java/org/gcube/dataharvest/harvester/sobigdata/SoBigDataHarvester.java @@ -2,13 +2,24 @@ package org.gcube.dataharvest.harvester.sobigdata; import java.text.ParseException; import java.util.Date; +import java.util.List; import org.gcube.dataharvest.harvester.BasicHarvester; public abstract class SoBigDataHarvester extends BasicHarvester { + protected List contexts; + public SoBigDataHarvester(Date start, Date end) throws ParseException { super(start, end); } + public List getContexts() { + return contexts; + } + + public void setContexts(List contexts) { + this.contexts = contexts; + } + }