D-Net
/
dnet-hadoop
13
4
Fork 10
Code Issues 14 Pull Requests 11 Projects 2 Releases 1 Wiki Activity

master #59

Closed
claudio.atzori wants to merge 3221 commits from master into stable_ids
pull from: master
merge into: D-Net:stable_ids
Conversation 0 Commits 3221 Files Changed 2141 +7 -7
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 69fd40fd30 - Show all commits

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

@ -108,7 +108,7 @@ public class SparkDumpFunderResults implements Serializable {
} }
private static void dumpResults(String nsp, Dataset<CommunityResult> results, String outputPath, String funderName, String funderDump) { private static void dumpResults(String nsp, Dataset<CommunityResult> results, String outputPath, String funderName) {
results.map((MapFunction<CommunityResult, CommunityResult>) r -> { results.map((MapFunction<CommunityResult, CommunityResult>) r -> {
if (!Optional.ofNullable(r.getProjects()).isPresent()) { if (!Optional.ofNullable(r.getProjects()).isPresent()) {
@ -117,7 +117,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
@ -132,18 +132,18 @@ public class SparkDumpFunderResults implements Serializable {
.write() .write()
.mode(SaveMode.Overwrite) .mode(SaveMode.Overwrite)
.option("compression", "gzip") .option("compression", "gzip")
.json(outputPath + "/" + funderDump); .json(outputPath + "/" + funderName);
} }
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, "HRZZ");
dumpResults(funder, results, outputPath, "MSES", "MZOS"); dumpResults(funder, results, outputPath, "MZOS");
} else } else
dumpResults(funder, results, outputPath, funderDump, null); dumpResults(funder, results, outputPath, funderDump);
} }