fix import of ORPs #390
|
@ -93,8 +93,8 @@ object CopyHdfsOafSparkApplication {
|
||||||
hasSource != null && hasTarget != null
|
hasSource != null && hasTarget != null
|
||||||
} else {
|
} else {
|
||||||
val hasId = (json \ "id").extractOrElse[String](null)
|
val hasId = (json \ "id").extractOrElse[String](null)
|
||||||
val resultType = (json \ "resulttype" \ "classid").extractOrElse[String](null)
|
val resultType = (json \ "resulttype" \ "classid").extractOrElse[String]("")
|
||||||
hasId != null && oafType.equalsIgnoreCase(resultType)
|
hasId != null && oafType.startsWith(resultType)
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -59,7 +59,19 @@ public class CopyHdfsOafSparkApplicationTest {
|
||||||
.getResourceAsStream(
|
.getResourceAsStream(
|
||||||
"/eu/dnetlib/dhp/oa/graph/raw/publication_2_unknownProperty.json")),
|
"/eu/dnetlib/dhp/oa/graph/raw/publication_2_unknownProperty.json")),
|
||||||
"publication"));
|
"publication"));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void isOafType_Datacite_ORP() throws IOException {
|
||||||
|
assertTrue(
|
||||||
|
CopyHdfsOafSparkApplication
|
||||||
|
.isOafType(
|
||||||
|
IOUtils
|
||||||
|
.toString(
|
||||||
|
getClass()
|
||||||
|
.getResourceAsStream(
|
||||||
|
"/eu/dnetlib/dhp/oa/graph/raw/datacite_orp.json")),
|
||||||
|
"otherresearchproduct"));
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue