D-Net
/
dhp-schemas
9
1
Fork 0
Code Issues 1 Pull Requests 3 Projects Releases Wiki Activity

added fields required by the Irish tender

This commit is contained in:
Claudio Atzori 2023-10-13 09:08:00 +02:00
parent fd56e17442
commit d56343164b
2 changed files with 54 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/eu/dnetlib/dhp/schema/oaf/OpenAccessColor.java Normal file
View File

@ -0,0 +1,11 @@
package eu.dnetlib.dhp.schema.oaf;
/**
* The OpenAccess color meant to be used on the result level
*/
public enum OpenAccessColor {
gold, hybrid, bronze
}

55
src/main/java/eu/dnetlib/dhp/schema/oaf/Result.java
View File

@ -21,17 +21,13 @@ public class Result extends OafEntity implements Serializable {
/** /**
* ( article | book ) processing charges. * ( article | book ) processing charges.
*/ */
private Field<String> processingchargeamount; private Field<String> processingchargeamount;
/** /**
* currency - alphabetic code describe in ISO-4217. * currency - alphabetic code describe in ISO-4217.
*/ */
private Field<String> processingchargecurrency; private Field<String> processingchargecurrency;
/** /**
* The Author. * The Author.
*/ */
@ -144,7 +140,13 @@ public class Result extends OafEntity implements Serializable {
*/ */
private List<EoscIfGuidelines> eoscifguidelines; private List<EoscIfGuidelines> eoscifguidelines;
private Boolean isGreen;
private OpenAccessColor openAccessColor;
private Boolean isInDiamondJournal;
private Boolean publiclyFunded;
public Field<String> getProcessingchargeamount() { public Field<String> getProcessingchargeamount() {
return processingchargeamount; return processingchargeamount;
@ -548,6 +550,38 @@ public class Result extends OafEntity implements Serializable {
this.eoscifguidelines = eoscifguidelines; this.eoscifguidelines = eoscifguidelines;
} }
public Boolean getGreen() {
return isGreen;
}
public void setGreen(Boolean green) {
isGreen = green;
}
public OpenAccessColor getOpenAccessColor() {
return openAccessColor;
}
public void setOpenAccessColor(OpenAccessColor openAccessColor) {
this.openAccessColor = openAccessColor;
}
public Boolean getInDiamondJournal() {
return isInDiamondJournal;
}
public void setInDiamondJournal(Boolean inDiamondJournal) {
isInDiamondJournal = inDiamondJournal;
}
public Boolean getPubliclyFunded() {
return publiclyFunded;
}
public void setPubliclyFunded(Boolean publiclyFunded) {
this.publiclyFunded = publiclyFunded;
}
/** /**
* Is an enrichment boolean. * Is an enrichment boolean.
* *
@ -560,7 +594,6 @@ public class Result extends OafEntity implements Serializable {
&& ModelConstants.PROVENANCE_ENRICH.equalsIgnoreCase(e.getDataInfo().getProvenanceaction().getClassid()); && ModelConstants.PROVENANCE_ENRICH.equalsIgnoreCase(e.getDataInfo().getProvenanceaction().getClassid());
} }
/** /**
* Normalize pid string. * Normalize pid string.
* *
@ -684,11 +717,11 @@ public class Result extends OafEntity implements Serializable {
//ENRICH measures //ENRICH measures
if (enrichment.getMeasures()!=null) if (enrichment.getMeasures()!=null)
if (currentInstance.getMeasures() == null) if (currentInstance.getMeasures() == null) {
currentInstance.setMeasures(enrichment.getMeasures()); currentInstance.setMeasures(enrichment.getMeasures());
else } else {
enrichment.getMeasures().forEach(currentInstance.getMeasures()::add); enrichment.getMeasures().forEach(currentInstance.getMeasures()::add);
}
} }
@ -712,11 +745,11 @@ public class Result extends OafEntity implements Serializable {
toEnrichInstances.forEach(i -> { toEnrichInstances.forEach(i -> {
final List<Instance> e = findEnrichmentsByPID(i.getPid(), ri); final List<Instance> e = findEnrichmentsByPID(i.getPid(), ri);
if (e!= null && e.size()> 0) { if (e!= null && !e.isEmpty()) {
e.forEach(enr -> applyEnrichment(i, enr)); e.forEach(enr -> applyEnrichment(i, enr));
} else { } else {
final List<Instance> a = findEnrichmentsByPID(i.getAlternateIdentifier(), ri); final List<Instance> a = findEnrichmentsByPID(i.getAlternateIdentifier(), ri);
if (a!= null && a.size()> 0) { if (a!= null && !a.isEmpty()) {
a.forEach(enr -> applyEnrichment(i, enr)); a.forEach(enr -> applyEnrichment(i, enr));
} }
} }
@ -740,8 +773,6 @@ public class Result extends OafEntity implements Serializable {
processingchargecurrency = r.getProcessingchargecurrency(); processingchargecurrency = r.getProcessingchargecurrency();
} }
eoscifguidelines = mergeLists(eoscifguidelines, r.getEoscifguidelines()); eoscifguidelines = mergeLists(eoscifguidelines, r.getEoscifguidelines());
if( !isAnEnrichment(this) && !isAnEnrichment(e)) if( !isAnEnrichment(this) && !isAnEnrichment(e))