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

master #11

Manually merged
claudio.atzori merged 275 commits from :master into enrichment_wfs 2020-05-11 15:14:56 +02:00
Conversation 1 Commits 275 Files Changed 156 +6 -2
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b46b080ddc - Show all commits

8
dhp-workflows/dhp-propagation/src/main/java/eu/dnetlib/dhp/countrypropagation/SparkCountryPropagationJob2.java
View File

@ -135,12 +135,16 @@ public class SparkCountryPropagationJob2 {
for (Qualifier country : r.getCountry()) { for (Qualifier country : r.getCountry()) {
countries.add(country.getClassid()); countries.add(country.getClassid());
} }
Result res = new Result();
res.setId(r.getId());
List<Country> countryList = new ArrayList<>();
for (CountrySbs country : potentialNewCountries.get().getCountrySet()) { for (CountrySbs country : potentialNewCountries.get().getCountrySet()) {
if (!countries.contains(country.getClassid())) { if (!countries.contains(country.getClassid())) {
r.getCountry().add(getCountry(country.getClassid(), country.getClassname())); countryList.add(getCountry(country.getClassid(), country.getClassname()));
} }
} }
res.setCountry(countryList);
r.mergeFrom(res);
} }
return r; return r;
}, Encoders.bean(resultClazz)); }, Encoders.bean(resultClazz));