sabeel
/
dnet-hadoop
forked from D-Net/dnet-hadoop
1
0
Fork 0
Code Pull Requests Activity

[graph provision]fixed wf definition, revised serialization of the usage counts measures

This commit is contained in:
Claudio Atzori 2024-05-21 13:47:05 +02:00
parent 92f018d196
commit 834461ba26
2 changed files with 9 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
dhp-workflows/dhp-graph-provision/src/main/java/eu/dnetlib/dhp/oa/provision/utils/XmlSerializationUtils.java
View File

@ -170,30 +170,19 @@ public class XmlSerializationUtils {
return sb.toString(); return sb.toString();
} }
// <measure downloads="0" views="0">infrastruct_::f66f1bd369679b5b077dcdf006089556||OpenAIRE</measure> // <measure views="0" datasource="infrastruct_::f66f1bd369679b5b077dcdf006089556||OpenAIRE" />
// <measure downloads="0" datasource="infrastruct_::f66f1bd369679b5b077dcdf006089556||OpenAIRE" />
public static String usageMeasureAsXmlElement(String name, Measure measure) { public static String usageMeasureAsXmlElement(String name, Measure measure) {
HashSet<String> dsIds = Optional
.ofNullable(measure.getUnit())
.map(
m -> m
.stream()
.map(KeyValue::getKey)
.collect(Collectors.toCollection(HashSet::new)))
.orElse(new HashSet<>());
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
dsIds.forEach(dsId -> { for (KeyValue kv : measure.getUnit()) {
sb sb
.append("<") .append("<")
.append(name); .append(name)
for (KeyValue kv : measure.getUnit()) {
sb.append(" ").append(attr(measure.getId(), kv.getValue()));
}
sb
.append(" ") .append(" ")
.append(attr("datasource", dsId)) .append(attr(measure.getId(), kv.getValue()))
.append("/>"); .append(attr("datasource", kv.getKey()))
}); .append(" />");
}
return sb.toString(); return sb.toString();
} }

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

@ -15,8 +15,8 @@
</property> </property>
<property> <property>
<name>validateXML</name> <name>validateXML</name>
<description>should the payload converter validate the XMLs</description>
<value>false</value> <value>false</value>
<description>should the payload converter validate the XMLs</description>
</property> </property>
<property> <property>
<name>relPartitions</name> <name>relPartitions</name>