diff --git a/DataMinerAlgorithmsCrawler/pom.xml b/DataMinerAlgorithmsCrawler/pom.xml
index b7c7991..55d8285 100644
--- a/DataMinerAlgorithmsCrawler/pom.xml
+++ b/DataMinerAlgorithmsCrawler/pom.xml
@@ -11,6 +11,18 @@
Plugin for gCat-Feeder for DataMiner Algorithms publishing
+
+
+
+ org.gcube.distribution
+ gcube-bom
+ LATEST
+ pom
+ import
+
+
+
+
@@ -25,7 +37,18 @@
[1.6.0-SNAPSHOT,2.0.0-SNAPSHOT)
-
+
+ com.fasterxml.jackson.core
+ jackson-databind
+ provided
+
+
+
+
+ org.slf4j
+ slf4j-api
+ provided
+
org.gcube.data-publishing.gCat-Feeder
diff --git a/DataMinerAlgorithmsCrawler/src/main/java/org/gcube/data/publishing/gCatFeeder/collectors/dm/Constants.java b/DataMinerAlgorithmsCrawler/src/main/java/org/gcube/data/publishing/gCatFeeder/collectors/dm/Constants.java
index c93e1e4..4c5be96 100644
--- a/DataMinerAlgorithmsCrawler/src/main/java/org/gcube/data/publishing/gCatFeeder/collectors/dm/Constants.java
+++ b/DataMinerAlgorithmsCrawler/src/main/java/org/gcube/data/publishing/gCatFeeder/collectors/dm/Constants.java
@@ -16,6 +16,6 @@ public class Constants {
public static final String DEFAULT_MAINTAINER=ENVIRONMENT_PROPERTIES_BASE+"DEFAULT_MAINTAINER";
- public static final String VISIBILITY=ENVIRONMENT_PROPERTIES_BASE+"VISIBILITY";
+ public static final String PRIVATE=ENVIRONMENT_PROPERTIES_BASE+"PRIVATE";
}
diff --git a/DataMinerAlgorithmsCrawler/src/main/java/org/gcube/data/publishing/gCatFeeder/collectors/dm/DMAlgorithmsInfoCollector.java b/DataMinerAlgorithmsCrawler/src/main/java/org/gcube/data/publishing/gCatFeeder/collectors/dm/DMAlgorithmsInfoCollector.java
index 82f22b7..530a6a0 100644
--- a/DataMinerAlgorithmsCrawler/src/main/java/org/gcube/data/publishing/gCatFeeder/collectors/dm/DMAlgorithmsInfoCollector.java
+++ b/DataMinerAlgorithmsCrawler/src/main/java/org/gcube/data/publishing/gCatFeeder/collectors/dm/DMAlgorithmsInfoCollector.java
@@ -1,5 +1,6 @@
package org.gcube.data.publishing.gCatFeeder.collectors.dm;
+import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
@@ -33,7 +34,9 @@ public class DMAlgorithmsInfoCollector implements DataCollector tags=new ArrayList<>();
diff --git a/DataMinerAlgorithmsCrawler/src/main/java/org/gcube/data/publishing/gCatFeeder/collectors/dm/model/ckan/CkanItem.java b/DataMinerAlgorithmsCrawler/src/main/java/org/gcube/data/publishing/gCatFeeder/collectors/dm/model/ckan/CkanItem.java
index 39c5e67..f73df95 100644
--- a/DataMinerAlgorithmsCrawler/src/main/java/org/gcube/data/publishing/gCatFeeder/collectors/dm/model/ckan/CkanItem.java
+++ b/DataMinerAlgorithmsCrawler/src/main/java/org/gcube/data/publishing/gCatFeeder/collectors/dm/model/ckan/CkanItem.java
@@ -2,6 +2,8 @@ package org.gcube.data.publishing.gCatFeeder.collectors.dm.model.ckan;
import java.util.ArrayList;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
import lombok.Getter;
import lombok.Setter;
@Getter
@@ -9,6 +11,21 @@ import lombok.Setter;
public class CkanItem {
+ @Getter
+ @Setter
+ public static class Tag{
+ public Tag() {
+ // TODO Auto-generated constructor stub
+ }
+
+ public Tag(String value) {
+ name=value;
+ }
+
+ private String name;
+ }
+
+
public CkanItem() {
// TODO Auto-generated constructor stub
}
@@ -17,11 +34,12 @@ public class CkanItem {
private String title;
private String description;
private String version;
- private String visibility;
- private String license;
+ @JsonProperty("private")
+ private Boolean privateFlag;
+ private String license_id;
private String author;
private String maintainer;
- private ArrayList tags=new ArrayList();
+ private ArrayList tags=new ArrayList();
private ArrayList extras=new ArrayList<>();
}
diff --git a/DataMinerAlgorithmsCrawler/src/main/java/org/gcube/data/publishing/gCatFeeder/collectors/dm/model/ckan/GCatModel.java b/DataMinerAlgorithmsCrawler/src/main/java/org/gcube/data/publishing/gCatFeeder/collectors/dm/model/ckan/GCatModel.java
index 25424fb..b4c9456 100644
--- a/DataMinerAlgorithmsCrawler/src/main/java/org/gcube/data/publishing/gCatFeeder/collectors/dm/model/ckan/GCatModel.java
+++ b/DataMinerAlgorithmsCrawler/src/main/java/org/gcube/data/publishing/gCatFeeder/collectors/dm/model/ckan/GCatModel.java
@@ -37,18 +37,18 @@ public class GCatModel implements CatalogueFormatData {
// item.setAuthor(desc.getAuthor());
item.setDescription(desc.getDescription());
item.setTitle(desc.getName()+" in "+ContextUtils.getCurrentScopeName());
- item.setLicense("CC-BY-NC-SA-4.0");
+ item.setLicense_id("CC-BY-NC-SA-4.0");
// item.setMaintainer(desc.getMaintainer());
item.setName(item.getTitle().toLowerCase().toLowerCase().replaceAll(" ", "_"));
for(String tag:desc.getTags()) {
- item.getTags().add(fixTag(tag));
+ item.getTags().add(new CkanItem.Tag(fixTag(tag)));
}
- item.getTags().add(ContextUtils.getCurrentScopeName());
- item.getTags().add("WPS");
- item.getTags().add("Analytics");
- item.getExtras().add(new CKanExtraField("system", profileID));
+ item.getTags().add(new CkanItem.Tag(ContextUtils.getCurrentScopeName()));
+ item.getTags().add(new CkanItem.Tag("WPS"));
+ item.getTags().add(new CkanItem.Tag("Analytics"));
+ item.getExtras().add(new CKanExtraField("system:type", profileID));
- item.setVisibility(desc.getVisibility());
+ item.setPrivateFlag(desc.getPrivateFlag());
// TODO ADD PARAMETERS
for(Parameter param: desc.getParameters())
diff --git a/DataMinerAlgorithmsCrawler/src/main/resources/org/gcube/data/publishing/gCatFeeder/collectors/dm/profile.xml b/DataMinerAlgorithmsCrawler/src/main/resources/org/gcube/data/publishing/gCatFeeder/collectors/dm/profile.xml
index d48d890..4a23c90 100644
--- a/DataMinerAlgorithmsCrawler/src/main/resources/org/gcube/data/publishing/gCatFeeder/collectors/dm/profile.xml
+++ b/DataMinerAlgorithmsCrawler/src/main/resources/org/gcube/data/publishing/gCatFeeder/collectors/dm/profile.xml
@@ -1,21 +1,21 @@
Input Parameter
- String
false
+ String
Input parameter expected for the execution of the process
Output Parameter
- String
false
+ String
Output parameter expected from the execution of the process
Process Author
- String
false
+ String
*
The name of the author, with email and ORCID. The format should