[Funder] changed the chosen funder identifier

This commit is contained in:
Miriam Baglioni 2024-03-01 14:50:21 +01:00
parent d5000502ea
commit ec55a22091
1 changed files with 6 additions and 3 deletions

View File

@ -98,10 +98,13 @@ public class SparkDumpFunderResults implements Serializable {
if (ofunder.isPresent()) { if (ofunder.isPresent()) {
String fName = ofunder.get().getShortName(); String fName = ofunder.get().getShortName();
if (StringUtil.isNullOrEmpty(fName)) if (StringUtil.isNullOrEmpty(fName))
return ofunder.get().getName(); if (p.getId().indexOf("_") < 0)
if (fName.equalsIgnoreCase("ec")) { return p.getId().substring(0, p.getId().indexOf(":"));
else
return p.getId().substring(0, p.getId().indexOf("_"));
// ofunder.get().getName();
if (fName.equalsIgnoreCase("ec"))
fName += "_" + ofunder.get().getFundingStream(); fName += "_" + ofunder.get().getFundingStream();
}
return fName; return fName;
} else { } else {
String fName = p.getId().substring(0, p.getId().indexOf("_")).toUpperCase(); String fName = p.getId().substring(0, p.getId().indexOf("_")).toUpperCase();