From bc342bf73ac9593901f08a7d038db4aad0ed6608 Mon Sep 17 00:00:00 2001 From: Sandro La Bruzzo Date: Wed, 26 Feb 2020 12:49:47 +0100 Subject: [PATCH] fixed wrong generation type in summary --- .../dhp/provision/scholix/summary/ScholixSummary.java | 6 ++---- .../dhp/graph/Application/provision/oozie_app/workflow.xml | 4 ++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dhp-workflows/dhp-graph-provision/src/main/java/eu/dnetlib/dhp/provision/scholix/summary/ScholixSummary.java b/dhp-workflows/dhp-graph-provision/src/main/java/eu/dnetlib/dhp/provision/scholix/summary/ScholixSummary.java index 577126cd54..8cde8e679a 100644 --- a/dhp-workflows/dhp-graph-provision/src/main/java/eu/dnetlib/dhp/provision/scholix/summary/ScholixSummary.java +++ b/dhp-workflows/dhp-graph-provision/src/main/java/eu/dnetlib/dhp/provision/scholix/summary/ScholixSummary.java @@ -223,7 +223,7 @@ public class ScholixSummary implements Serializable { .collect(Collectors.toList()) ); - summary.setTypology(Typology.dataset); + summary.setTypology(Typology.publication); if (item.getTitle() != null) 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.setRelatedPublications(relatedItemInfo.getRelatedPublication()); summary.setRelatedUnknown(relatedItemInfo.getRelatedUnknown()); - + summary.setTypology(Typology.unknown); if (item.getDlicollectedfrom() != null) summary.setDatasources(item.getDlicollectedfrom().stream() .map( c -> new CollectedFromType(c.getName(), c.getId(), c.getCompletionStatus()) ).collect(Collectors.toList())); - - return summary; } } diff --git a/dhp-workflows/dhp-graph-provision/src/main/resources/eu/dnetlib/dhp/graph/Application/provision/oozie_app/workflow.xml b/dhp-workflows/dhp-graph-provision/src/main/resources/eu/dnetlib/dhp/graph/Application/provision/oozie_app/workflow.xml index 8ce51069f8..3008448076 100644 --- a/dhp-workflows/dhp-graph-provision/src/main/resources/eu/dnetlib/dhp/graph/Application/provision/oozie_app/workflow.xml +++ b/dhp-workflows/dhp-graph-provision/src/main/resources/eu/dnetlib/dhp/graph/Application/provision/oozie_app/workflow.xml @@ -27,7 +27,7 @@ - + Action failed, error message[${wf:errorMessage(wf:lastErrorNode())}] @@ -73,7 +73,7 @@ --workingDirPath${workingDirPath} --graphPath${graphPath} - +