Commit 958e3be5 authored by Matija Obreza's avatar Matija Obreza

Merge branch '32-enable-mapping-for-dataproviderid' into 'master'

Resolve "Enable mapping for dataProviderId"

Closes #32

See merge request !26
parents 5b241ef9 12e69f2d
......@@ -352,6 +352,9 @@ public class RowConverter {
if (rdfValues == null) {
return null;
}
if (rdfValues instanceof String && StringUtils.isBlank(rdfValues.toString())) {
return null;
}
if (targetType == String.class) {
return new TextNode(rdfValues.toString());
}
......
......@@ -100,6 +100,9 @@ public class GenesysJSON {
JsonField doi = new JsonField(Api1Constants.Accession.DOI, RdfMCPD.DOI).setRequired(false);
columns.add(doi);
JsonField dataProviderId = new JsonField(Api1Constants.Accession.DATA_PROVIDER_ID, RdfMCPD.DATA_PROVIDER_ID).setRequired(false);
columns.add(dataProviderId);
JsonField acceNumb = new JsonField(Api1Constants.Accession.ACCENUMB, RdfMCPD.ACCENUMB).setRequired(true);
columns.add(acceNumb);
......
......@@ -30,6 +30,13 @@ public class MCPD {
public MCPD() {
List<ColumnDef> columns = new ArrayList<ColumnDef>();
ColumnDef dataProviderId = new ColumnDef("DATA_PROVIDER_ID", "Data provider ID", ColumnDataType.TEXT, true, RdfMCPD.DATA_PROVIDER_ID).setIncludeNull(false);
columns.add(dataProviderId);
ColumnDef doi = new ColumnDef("DOI", "Digital object identifier", ColumnDataType.TEXT, true, RdfMCPD.DOI);
columns.add(doi);
ColumnDef instCode = new ColumnDef("INSTCODE", "Institute code", ColumnDataType.TEXT, false, RdfMCPD.INSTCODE);
instCode.getValidators().add(new FaoWiewsInstCodeValidator());
columns.add(instCode);
......@@ -38,9 +45,6 @@ public class MCPD {
newInstCode.getValidators().add(new FaoWiewsInstCodeValidator());
columns.add(newInstCode);
ColumnDef doi = new ColumnDef("DOI", "Digital object identifier", ColumnDataType.TEXT, true, RdfMCPD.DOI);
columns.add(doi);
ColumnDef acceNumb = new ColumnDef("ACCENUMB", "Accession number", ColumnDataType.TEXT, true, RdfMCPD.ACCENUMB);
columns.add(acceNumb);
......
......@@ -21,6 +21,7 @@ public class RdfMCPD {
public static final String INSTCODE = "http://rs.tdwg.org/dwc/terms/institutionCode";
public static final String INSTCODE_NEW = "https://www.genesys-pgr.org/rdf/mcpd#newInstituteCode";
public static final String DOI = "http://prismstandard.org/namespaces/1.2/basic/doi";
public static final String DATA_PROVIDER_ID = "https://www.genesys-pgr.org/rdf/mcpd#dataProviderId";
public static final String ACCENUMB = "http://purl.org/germplasm/germplasmTerm#germplasmID";
public static final String ACCENUMB_NEW = "https://www.genesys-pgr.org/rdf/mcpd#newAcceNumb";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment