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

[UsageCount] Added measure at the level of the OafEntity

This commit is contained in:
Miriam Baglioni 2023-02-10 16:50:19 +01:00
parent 3123e3f1f2
commit 0327320b53
2 changed files with 27 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/main/java/eu/dnetlib/dhp/schema/oaf/OafEntity.java
View File

@ -21,6 +21,29 @@ public abstract class OafEntity extends Oaf implements Serializable {
private OAIProvenance oaiprovenance; private OAIProvenance oaiprovenance;
/**
* The Measures.
*/
private List<Measure> measures;
/**
* Gets measures.
*
* @return the measures
*/
public List<Measure> getMeasures() {
return measures;
}
/**
* Sets measures.
*
* @param measures the measures
*/
public void setMeasures(List<Measure> measures) {
this.measures = measures;
}
public String getId() { public String getId() {
return id; return id;
} }
@ -94,6 +117,8 @@ public abstract class OafEntity extends Oaf implements Serializable {
if (e.getOaiprovenance() != null && compareTrust(this, e) < 0) if (e.getOaiprovenance() != null && compareTrust(this, e) < 0)
oaiprovenance = e.getOaiprovenance(); oaiprovenance = e.getOaiprovenance();
measures = mergeLists(measures, e.getMeasures());
} }
@SafeVarargs @SafeVarargs

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

@ -30,10 +30,7 @@ public class Result extends OafEntity implements Serializable {
*/ */
private Field<String> processingchargecurrency; private Field<String> processingchargecurrency;
/**
* The Measures.
*/
private List<Measure> measures;
/** /**
* The Author. * The Author.
@ -147,23 +144,7 @@ public class Result extends OafEntity implements Serializable {
*/ */
private List<EoscIfGuidelines> eoscifguidelines; private List<EoscIfGuidelines> eoscifguidelines;
/**
* Gets measures.
*
* @return the measures
*/
public List<Measure> getMeasures() {
return measures;
}
/**
* Sets measures.
*
* @param measures the measures
*/
public void setMeasures(List<Measure> measures) {
this.measures = measures;
}
public Field<String> getProcessingchargeamount() { public Field<String> getProcessingchargeamount() {
return processingchargeamount; return processingchargeamount;
@ -759,7 +740,7 @@ public class Result extends OafEntity implements Serializable {
processingchargecurrency = r.getProcessingchargecurrency(); processingchargecurrency = r.getProcessingchargecurrency();
} }
measures = mergeLists(measures, r.getMeasures());
eoscifguidelines = mergeLists(eoscifguidelines, r.getEoscifguidelines()); eoscifguidelines = mergeLists(eoscifguidelines, r.getEoscifguidelines());