spyros
/
dnet-hadoop
forked from D-Net/dnet-hadoop
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

-

This commit is contained in:
Miriam Baglioni 2020-07-09 14:05:21 +02:00
parent a634794242
commit faea30cda0
2 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dhp-workflows/dhp-enrichment/src/main/java/eu/dnetlib/dhp/bulktag/community/QueryInformationSystem.java
View File

@ -41,7 +41,7 @@ public class QueryInformationSystem {
+ " </selcriteria> " + " </selcriteria> "
+ " </datasource> } " + " </datasource> } "
+ " </datasources> " + + " </datasources> " +
" <zenodocommunities> "+ " <zenodocommunities> " +
"{for $zc in $zenodo " + "{for $zc in $zenodo " +
"return " + "return " +
"<zenodocommunity> " + "<zenodocommunity> " +

29
dhp-workflows/dhp-enrichment/src/main/java/eu/dnetlib/dhp/bulktag/community/ResultTagger.java
View File

@ -71,10 +71,9 @@ public class ResultTagger implements Serializable {
// tagging for Subject // tagging for Subject
final Set<String> subjects = new HashSet<>(); final Set<String> subjects = new HashSet<>();
Optional<List<StructuredProperty>> oresultsubj = Optional.ofNullable(result.getSubject());
if (oresultsubj.isPresent()) { if (Objects.nonNull(result.getSubject())){
oresultsubj result.getSubject()
.get()
.stream() .stream()
.map(subject -> subject.getValue()) .map(subject -> subject.getValue())
.filter(StringUtils::isNotBlank) .filter(StringUtils::isNotBlank)
@ -90,15 +89,23 @@ public class ResultTagger implements Serializable {
final Set<String> datasources = new HashSet<>(); final Set<String> datasources = new HashSet<>();
final Set<String> tmp = new HashSet<>(); final Set<String> tmp = new HashSet<>();
Optional<List<Instance>> oresultinstance = Optional.ofNullable(result.getInstance()); if (Objects.nonNull(result.getInstance())) {
if (oresultinstance.isPresent()) { for (Instance i : result.getInstance()) {
for (Instance i : oresultinstance.get()) { if(Objects.nonNull(i.getCollectedfrom())){
tmp.add(StringUtils.substringAfter(i.getCollectedfrom().getKey(), "|")); if(Objects.nonNull(i.getCollectedfrom().getKey())){
tmp.add(StringUtils.substringAfter(i.getHostedby().getKey(), "|")); tmp.add(StringUtils.substringAfter(i.getCollectedfrom().getKey(), "|"));
}
}
if(Objects.nonNull(i.getHostedby())){
if(Objects.nonNull(i.getHostedby().getKey())){
tmp.add(StringUtils.substringAfter(i.getHostedby().getKey(), "|"));
}
}
} }
oresultinstance result
.get() .getInstance()
.stream() .stream()
.map(i -> new Pair<>(i.getCollectedfrom().getKey(), i.getHostedby().getKey())) .map(i -> new Pair<>(i.getCollectedfrom().getKey(), i.getHostedby().getKey()))
.flatMap(p -> Stream.of(p.getFst(), p.getSnd())) .flatMap(p -> Stream.of(p.getFst(), p.getSnd()))