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

fixed wrong generation type in summary

This commit is contained in:
Sandro La Bruzzo 2020-02-26 12:49:47 +01:00
parent 3112e21858
commit bc342bf73a
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dhp-workflows/dhp-graph-provision/src/main/java/eu/dnetlib/dhp/provision/scholix/summary/ScholixSummary.java
View File

@ -223,7 +223,7 @@ public class ScholixSummary implements Serializable {
.collect(Collectors.toList()) .collect(Collectors.toList())
); );
summary.setTypology(Typology.dataset); summary.setTypology(Typology.publication);
if (item.getTitle() != null) if (item.getTitle() != null)
summary.setTitle(item.getTitle().stream().map(StructuredProperty::getValue).collect(Collectors.toList())); summary.setTitle(item.getTitle().stream().map(StructuredProperty::getValue).collect(Collectors.toList()));
@ -276,14 +276,12 @@ public class ScholixSummary implements Serializable {
summary.setRelatedDatasets(relatedItemInfo.getRelatedDataset()); summary.setRelatedDatasets(relatedItemInfo.getRelatedDataset());
summary.setRelatedPublications(relatedItemInfo.getRelatedPublication()); summary.setRelatedPublications(relatedItemInfo.getRelatedPublication());
summary.setRelatedUnknown(relatedItemInfo.getRelatedUnknown()); summary.setRelatedUnknown(relatedItemInfo.getRelatedUnknown());
summary.setTypology(Typology.unknown);
if (item.getDlicollectedfrom() != null) if (item.getDlicollectedfrom() != null)
summary.setDatasources(item.getDlicollectedfrom().stream() summary.setDatasources(item.getDlicollectedfrom().stream()
.map( .map(
c -> new CollectedFromType(c.getName(), c.getId(), c.getCompletionStatus()) c -> new CollectedFromType(c.getName(), c.getId(), c.getCompletionStatus())
).collect(Collectors.toList())); ).collect(Collectors.toList()));
return summary; return summary;
} }
} }

4
dhp-workflows/dhp-graph-provision/src/main/resources/eu/dnetlib/dhp/graph/Application/provision/oozie_app/workflow.xml
View File

@ -27,7 +27,7 @@
</parameters> </parameters>
<start to="generateScholix"/> <start to="generateSummary"/>
<kill name="Kill"> <kill name="Kill">
<message>Action failed, error message[${wf:errorMessage(wf:lastErrorNode())}]</message> <message>Action failed, error message[${wf:errorMessage(wf:lastErrorNode())}]</message>
@ -73,7 +73,7 @@
<arg>--workingDirPath</arg><arg>${workingDirPath}</arg> <arg>--workingDirPath</arg><arg>${workingDirPath}</arg>
<arg>--graphPath</arg><arg>${graphPath}</arg> <arg>--graphPath</arg><arg>${graphPath}</arg>
</spark> </spark>
<ok to="indexSummary"/> <ok to="generateScholix"/>
<error to="Kill"/> <error to="Kill"/>
</action> </action>