git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/data-publishing/gCat-Feeder-Suite@179488 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
parent
b50eb7a437
commit
9790d6b3f8
|
|
@ -11,6 +11,18 @@
|
|||
<description>Plugin for gCat-Feeder for DataMiner Algorithms publishing</description>
|
||||
|
||||
|
||||
<dependencyManagement>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.gcube.distribution</groupId>
|
||||
<artifactId>gcube-bom</artifactId>
|
||||
<version>LATEST</version>
|
||||
<type>pom</type>
|
||||
<scope>import</scope>
|
||||
</dependency>
|
||||
|
||||
</dependencies>
|
||||
</dependencyManagement>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
|
|
@ -25,7 +37,18 @@
|
|||
<version>[1.6.0-SNAPSHOT,2.0.0-SNAPSHOT)</version>
|
||||
</dependency>
|
||||
|
||||
|
||||
<dependency>
|
||||
<groupId>com.fasterxml.jackson.core</groupId>
|
||||
<artifactId>jackson-databind</artifactId>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
|
||||
|
||||
<dependency>
|
||||
<groupId>org.slf4j</groupId>
|
||||
<artifactId>slf4j-api</artifactId>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<!-- TEST -->
|
||||
<dependency>
|
||||
<groupId>org.gcube.data-publishing.gCat-Feeder</groupId>
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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<InternalAlgorith
|
|||
|
||||
|
||||
public void setEnvironmentConfiguration(EnvironmentConfiguration envConfig) {
|
||||
this.env=envConfig.getCurrentConfiguration();
|
||||
if(envConfig!=null)
|
||||
this.env=envConfig.getCurrentConfiguration();
|
||||
else env=Collections.emptyMap();
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -88,6 +91,7 @@ public class DMAlgorithmsInfoCollector implements DataCollector<InternalAlgorith
|
|||
desc.setId(opID);
|
||||
desc.setName(operatorName);
|
||||
|
||||
|
||||
desc.setAuthor(parseUser(getAuthor(opDescription)));
|
||||
|
||||
|
||||
|
|
@ -113,7 +117,7 @@ public class DMAlgorithmsInfoCollector implements DataCollector<InternalAlgorith
|
|||
if(wpsbaseUrl!=null) {
|
||||
// desc.setWpsLink(wpsLink);
|
||||
}
|
||||
desc.setVisibility(env.get(Constants.VISIBILITY));
|
||||
desc.setPrivateFlag(Boolean.parseBoolean(env.get(Constants.PRIVATE)));
|
||||
|
||||
toReturn.add(desc);
|
||||
}
|
||||
|
|
@ -153,7 +157,7 @@ public class DMAlgorithmsInfoCollector implements DataCollector<InternalAlgorith
|
|||
String splitter=null;
|
||||
if(userString.contains(" "))
|
||||
splitter=" ";
|
||||
else if (userString.contains(".")) splitter=".";
|
||||
else if (userString.contains(".")) splitter="\\.";
|
||||
|
||||
String[] splitted=userString.split(splitter);
|
||||
return new UserIdentity(splitted[0], splitted[1], null, null);
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
package org.gcube.data.publishing.gCatFeeder.collectors.dm;
|
||||
|
||||
import java.io.InputStream;
|
||||
import java.nio.file.Files;
|
||||
import java.nio.file.Path;
|
||||
import java.nio.file.Paths;
|
||||
|
|
@ -64,10 +65,11 @@ public class DataMinerPlugin implements CollectorPlugin<InternalAlgorithmDescrip
|
|||
@Override
|
||||
public void init() throws Exception {
|
||||
log.debug("Initializing..");
|
||||
Path p=Paths.get(this.getClass().getResource( "profile.xml").toURI());
|
||||
log.debug("Path is : {} ",p.toUri());
|
||||
GCatModel.setProfile(
|
||||
new String(Files.readAllBytes(p)));
|
||||
|
||||
InputStream is = getClass().getResourceAsStream("profile.xml");
|
||||
java.util.Scanner scanner = new java.util.Scanner(is).useDelimiter("\\A");
|
||||
String json = scanner.hasNext() ? scanner.next() : "";
|
||||
GCatModel.setProfile(json);
|
||||
|
||||
DataMinerCollectorProperties.init();
|
||||
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ public class InternalAlgorithmDescriptor implements CustomData {
|
|||
private String guiLink;
|
||||
private String wpsLink;
|
||||
|
||||
private String visibility;
|
||||
private Boolean privateFlag;
|
||||
|
||||
|
||||
private List<String> tags=new ArrayList<>();
|
||||
|
|
|
|||
|
|
@ -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<String> tags=new ArrayList<String>();
|
||||
private ArrayList<Tag> tags=new ArrayList<Tag>();
|
||||
|
||||
private ArrayList<CKanExtraField> extras=new ArrayList<>();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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())
|
||||
|
|
|
|||
|
|
@ -1,21 +1,21 @@
|
|||
<metadataformat type="DataMiner Process">
|
||||
<metadatafield>
|
||||
<fieldName>Input Parameter</fieldName>
|
||||
<dataType>String</dataType>
|
||||
<mandatory>false</mandatory>
|
||||
<dataType>String</dataType>
|
||||
<note>Input parameter expected for the execution of the process</note>
|
||||
</metadatafield>
|
||||
<metadatafield>
|
||||
<fieldName>Output Parameter</fieldName>
|
||||
<dataType>String</dataType>
|
||||
<mandatory>false</mandatory>
|
||||
<dataType>String</dataType>
|
||||
<note>Output parameter expected from the execution of the process
|
||||
</note>
|
||||
</metadatafield>
|
||||
<metadatafield>
|
||||
<fieldName>Process Author</fieldName>
|
||||
<dataType>String</dataType>
|
||||
<mandatory>false</mandatory>
|
||||
<dataType>String</dataType>
|
||||
<maxOccurs>*</maxOccurs>
|
||||
<defaultValue />
|
||||
<note>The name of the author, with email and ORCID. The format should
|
||||
|
|
|
|||
Loading…
Reference in New Issue