diff --git a/dump/src/main/java/eu/dnetlib/dhp/oa/graph/dump/funderresults/SparkDumpFunderResults.java b/dump/src/main/java/eu/dnetlib/dhp/oa/graph/dump/funderresults/SparkDumpFunderResults.java index ad11516..07b86d0 100644 --- a/dump/src/main/java/eu/dnetlib/dhp/oa/graph/dump/funderresults/SparkDumpFunderResults.java +++ b/dump/src/main/java/eu/dnetlib/dhp/oa/graph/dump/funderresults/SparkDumpFunderResults.java @@ -98,10 +98,13 @@ public class SparkDumpFunderResults implements Serializable { if (ofunder.isPresent()) { String fName = ofunder.get().getShortName(); if (StringUtil.isNullOrEmpty(fName)) - return ofunder.get().getName(); - if (fName.equalsIgnoreCase("ec")) { + if (p.getId().indexOf("_") < 0) + 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(); - } return fName; } else { String fName = p.getId().substring(0, p.getId().indexOf("_")).toUpperCase();