andreas.czerniak
/
BrBETA_dnet-hadoop
forked from D-Net/dnet-hadoop
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

added merge for Programme

This commit is contained in:
Miriam Baglioni 2020-05-27 17:40:32 +02:00
parent f3dcca0dd0
commit dd1e0b93b8
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Project.java
View File

@ -330,6 +330,9 @@ public class Project extends OafEntity implements Serializable {
fundedamount = p.getFundedamount() != null && compareTrust(this, e) < 0 fundedamount = p.getFundedamount() != null && compareTrust(this, e) < 0
? p.getFundedamount() ? p.getFundedamount()
: fundedamount; : fundedamount;
programme = mergeLists(programme, p.getProgramme());
mergeOAFDataInfo(e); mergeOAFDataInfo(e);
} }
} }