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

[enrichment] adding relations in one side only

This commit is contained in:
Miriam Baglioni 2023-02-15 16:41:28 +01:00
parent 624c62f62d
commit eca7ebab6d
3 changed files with 17 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
dhp-workflows/dhp-enrichment/src/main/java/eu/dnetlib/dhp/projecttoresult/SparkResultToProjectThroughSemRelJob.java
View File

@ -107,30 +107,17 @@ public class SparkResultToProjectThroughSemRelJob {
potentialUpdate potentialUpdate
.getProjectSet() .getProjectSet()
.forEach( .forEach(
projectId -> { projectId -> newRelations
newRelations .add(
.add( getRelation(
getRelation( projectId,
resId, resId,
projectId, ModelConstants.PRODUCES,
ModelConstants.IS_PRODUCED_BY, ModelConstants.RESULT_PROJECT,
ModelConstants.RESULT_PROJECT, ModelConstants.OUTCOME,
ModelConstants.OUTCOME, PROPAGATION_DATA_INFO_TYPE,
PROPAGATION_DATA_INFO_TYPE, PROPAGATION_RELATION_RESULT_PROJECT_SEM_REL_CLASS_ID,
PROPAGATION_RELATION_RESULT_PROJECT_SEM_REL_CLASS_ID, PROPAGATION_RELATION_RESULT_PROJECT_SEM_REL_CLASS_NAME)));
PROPAGATION_RELATION_RESULT_PROJECT_SEM_REL_CLASS_NAME));
newRelations
.add(
getRelation(
projectId,
resId,
ModelConstants.PRODUCES,
ModelConstants.RESULT_PROJECT,
ModelConstants.OUTCOME,
PROPAGATION_DATA_INFO_TYPE,
PROPAGATION_RELATION_RESULT_PROJECT_SEM_REL_CLASS_ID,
PROPAGATION_RELATION_RESULT_PROJECT_SEM_REL_CLASS_NAME));
});
return newRelations.iterator(); return newRelations.iterator();
}; };
} }

10
dhp-workflows/dhp-enrichment/src/main/java/eu/dnetlib/dhp/resulttoorganizationfrominstrepo/SparkResultToOrganizationFromIstRepoJob.java
View File

@ -139,10 +139,12 @@ public class SparkResultToOrganizationFromIstRepoJob {
organizations organizations
.forEach( .forEach(
orgId -> newRelations orgId -> newRelations
.addAll( .add(
getOrganizationRelationPair( getRelation(
orgId, resultId, orgId,
resultId, ModelConstants.HAS_AUTHOR_INSTITUTION,
ModelConstants.RESULT_ORGANIZATION,
ModelConstants.AFFILIATION, PROPAGATION_DATA_INFO_TYPE,
PROPAGATION_RELATION_RESULT_ORGANIZATION_INST_REPO_CLASS_ID, PROPAGATION_RELATION_RESULT_ORGANIZATION_INST_REPO_CLASS_ID,
PROPAGATION_RELATION_RESULT_ORGANIZATION_INST_REPO_CLASS_NAME)) PROPAGATION_RELATION_RESULT_ORGANIZATION_INST_REPO_CLASS_NAME))

13
dhp-workflows/dhp-enrichment/src/main/java/eu/dnetlib/dhp/resulttoorganizationfromsemrel/SparkResultToOrganizationFromSemRel.java
View File

@ -211,19 +211,6 @@ public class SparkResultToOrganizationFromSemRel implements Serializable {
.groupByKey((MapFunction<Relation, String>) r -> r.getSource() + r.getTarget(), Encoders.STRING()) .groupByKey((MapFunction<Relation, String>) r -> r.getSource() + r.getTarget(), Encoders.STRING())
.mapGroups( .mapGroups(
(MapGroupsFunction<String, Relation, Relation>) (k, it) -> it.next(), Encoders.bean(Relation.class)) (MapGroupsFunction<String, Relation, Relation>) (k, it) -> it.next(), Encoders.bean(Relation.class))
.flatMap(
(FlatMapFunction<Relation, Relation>) r -> Arrays
.asList(
r, getRelation(
r.getTarget(), r.getSource(), ModelConstants.IS_AUTHOR_INSTITUTION_OF,
ModelConstants.RESULT_ORGANIZATION,
ModelConstants.AFFILIATION,
PROPAGATION_DATA_INFO_TYPE,
PROPAGATION_RELATION_RESULT_ORGANIZATION_SEM_REL_CLASS_ID,
PROPAGATION_RELATION_RESULT_ORGANIZATION_SEM_REL_CLASS_NAME))
.iterator()
, Encoders.bean(Relation.class))
.write() .write()
.mode(SaveMode.Append) .mode(SaveMode.Append)