D-Net
/
dnet-hadoop
14
5
Fork 11
Code Issues 14 Pull Requests 12 Projects 2 Releases 2 Wiki Activity

tried again to fix issue for croatian funder

This commit is contained in:
Miriam Baglioni 2021-02-24 10:49:55 +01:00
parent 9841086ef3
commit 5d92df0627
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/oa/graph/dump/funderresults/SparkDumpFunderResults.java
View File

@ -116,7 +116,7 @@ public class SparkDumpFunderResults implements Serializable {
} }
for (Project p : r.getProjects()) { for (Project p : r.getProjects()) {
if (p.getId().startsWith(nsp)) { if (p.getId().startsWith(nsp)) {
if (nsp.equals("40|irb")) { if (nsp.startsWith("40|irb")) {
if (p.getFunder().getShortName().equals(funderName)) if (p.getFunder().getShortName().equals(funderName))
return r; return r;
else else
@ -137,11 +137,11 @@ public class SparkDumpFunderResults implements Serializable {
private static void writeFunderResult(String funder, Dataset<CommunityResult> results, String outputPath, private static void writeFunderResult(String funder, Dataset<CommunityResult> results, String outputPath,
String funderDump) { String funderDump) {
if (funder.equals("40|irb")) { if (funder.startsWith("40|irb")) {
dumpResults(funder, results, outputPath, "CSF", "HRZZ"); dumpResults(funder, results, outputPath, "CSF", "HRZZ");
dumpResults(funder, results, outputPath, "MSES", "MZOS"); dumpResults(funder, results, outputPath, "MSES", "MZOS");
} else } else
dumpResults(funder, results, outputPath, funderDump, null); dumpResults(funder, results, outputPath, funderDump, funderDump);
} }