diff --git a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/gcat/CatalogueEntry.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/gcat/CatalogueEntry.java index 832a299b56..3de3a06286 100644 --- a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/gcat/CatalogueEntry.java +++ b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/gcat/CatalogueEntry.java @@ -9,7 +9,7 @@ import eu.dnetlib.dhp.schema.dump.oaf.KeyValue; public class CatalogueEntry implements Serializable { private String name; // openaire id withouut :: substitute with $$ - private String licence_id; // default "notspecified", + private String license_id; // default "notspecified", private String title; // title.maintitle private String notes; // description.value (the first description private String url; // the url of the resource in the openaire dashboard @@ -32,12 +32,12 @@ public class CatalogueEntry implements Serializable { this.name = name; } - public String getLicence_id() { - return licence_id; + public String getLicense_id() { + return license_id; } - public void setLicence_id(String licence_id) { - this.licence_id = licence_id; + public void setLicense_id(String license_id) { + this.license_id = license_id; } public String getTitle() { diff --git a/dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/oa/graph/dump/gcat/Mapper.java b/dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/oa/graph/dump/gcat/Mapper.java index b3aae322af..c0970ba94d 100644 --- a/dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/oa/graph/dump/gcat/Mapper.java +++ b/dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/oa/graph/dump/gcat/Mapper.java @@ -67,7 +67,7 @@ public class Mapper implements Serializable { } - out.setLicence_id(Constants.DEFAULT_LICENCE_ID); + out.setLicense_id(Constants.DEFAULT_LICENCE_ID); Optional .ofNullable(input.getAuthor()) @@ -115,7 +115,8 @@ public class Mapper implements Serializable { .ofNullable(input.getFormat()) .ifPresent(value -> value.forEach(f -> formatList.add(f.getValue()))); - out.setName(input.getId().replace(":", "$")); + String id = input.getId(); + out.setName(id.substring(id.indexOf('|') + 1).replace(":", "-")); Optional .ofNullable(input.getInstance())