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

relationships from relatedIdentifier whose target id type is one of the pid type with an authority

This commit is contained in:
Alessia Bardi 2022-09-23 15:47:05 +02:00
parent ba33ff71fd
commit c5eb722170
3 changed files with 630 additions and 603 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1206
dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/oa/graph/raw/AbstractMdRecordToOafMapper.java
View File

File diff suppressed because it is too large Load Diff

10
dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/oa/graph/raw/OdfToOafMapper.java
View File

@ -457,10 +457,12 @@ public class OdfToOafMapper extends AbstractMdRecordToOafMapper {
protected String guessRelatedIdentifier(final String idType, final String value) { protected String guessRelatedIdentifier(final String idType, final String value) {
if (StringUtils.isBlank(idType) || StringUtils.isBlank(value)) if (StringUtils.isBlank(idType) || StringUtils.isBlank(value))
return null; return null;
if (idType.equalsIgnoreCase("OPENAIRE")) { if (idType.equalsIgnoreCase("OPENAIRE")) return createOpenaireId(50, value, false);
return createOpenaireId(50, value, false); if(pidTypeWithAuthority.contains(idType.toLowerCase())){
} else return IdentifierFactory.idFromPid("50", idType, value, true);
return null; }
return null;
} }
@Override @Override

17
dhp-workflows/dhp-graph-mapper/src/test/java/eu/dnetlib/dhp/oa/graph/raw/MappersTest.java
View File

@ -933,7 +933,7 @@ class MappersTest {
System.out.println("***************"); System.out.println("***************");
System.out.println(new ObjectMapper().writeValueAsString(list)); System.out.println(new ObjectMapper().writeValueAsString(list));
System.out.println("***************"); System.out.println("***************");
assertEquals(3, list.size()); assertEquals(7, list.size());
final OtherResearchProduct p = (OtherResearchProduct) list.get(0); final OtherResearchProduct p = (OtherResearchProduct) list.get(0);
assertValidId(p.getId()); assertValidId(p.getId());
assertValidId(p.getCollectedfrom().get(0).getKey()); assertValidId(p.getCollectedfrom().get(0).getKey());
@ -941,6 +941,21 @@ class MappersTest {
assertTrue(StringUtils.isNotBlank(p.getTitle().get(0).getValue())); assertTrue(StringUtils.isNotBlank(p.getTitle().get(0).getValue()));
assertEquals("w3id", (p.getPid().get(0).getQualifier().getClassid())); assertEquals("w3id", (p.getPid().get(0).getQualifier().getClassid()));
assertEquals("https://w3id.org/ro-id/0ab171a7-45c5-4194-82d4-850955504bca", (p.getPid().get(0).getValue())); assertEquals("https://w3id.org/ro-id/0ab171a7-45c5-4194-82d4-850955504bca", (p.getPid().get(0).getValue()));
assertEquals(1, list.stream().filter(o -> o instanceof OtherResearchProduct).count());
assertEquals(6, list.stream().filter(o -> o instanceof Relation).count());
for(Oaf oaf : list){
if(oaf instanceof Relation){
String source = ((Relation) oaf).getSource();
String target = ((Relation) oaf).getTarget();
assertNotEquals(source, target);
assertTrue(source.equals(p.getId()) || target.equals(p.getId()));
assertNotNull(((Relation) oaf).getSubRelType());
assertNotNull( ((Relation) oaf).getRelClass());
assertNotNull(((Relation) oaf).getRelType());
}
}
} }
@Test @Test