enrico.ottonello
/
dnet-hadoop
forked from D-Net/dnet-hadoop
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed alternate identifier redundant

This commit is contained in:
Enrico Ottonello 2022-05-18 10:44:31 +02:00
parent aef88f9e5c
commit 792e78e848
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
dhp-workflows/dhp-aggregation/src/main/scala/eu/dnetlib/dhp/bioschema/BioschemaToOAFTransformation.scala
View File

@ -213,6 +213,7 @@ object BioschemaToOAFTransformation {
val alternativeIdentifierUrl: AlternateIdentifierType = alternativeIdentifierUrls.asJava.get(0) val alternativeIdentifierUrl: AlternateIdentifierType = alternativeIdentifierUrls.asJava.get(0)
val alternativeIdentifiers = resolvedURLPattern val alternativeIdentifiers = resolvedURLPattern
.filter(pattern => !pattern._1.contains(datasourceKey))
.map(pattern => { .map(pattern => {
if (alternativeIdentifierUrl.alternateIdentifier.startsWith(s"${pattern._1}")) { if (alternativeIdentifierUrl.alternateIdentifier.startsWith(s"${pattern._1}")) {
val relatedId = StringUtils.substringAfter(alternativeIdentifierUrl.alternateIdentifier, s"${pattern._1}") val relatedId = StringUtils.substringAfter(alternativeIdentifierUrl.alternateIdentifier, s"${pattern._1}")
@ -228,19 +229,10 @@ object BioschemaToOAFTransformation {
null null
}) })
.find(s => s != null) .find(s => s != null)
.get
val defaultAlternatedIdentifer: StructuredProperty = OafMapperUtils.structuredProperty( if (alternativeIdentifiers.isDefined) {
pid, instance.setAlternateIdentifier(List(alternativeIdentifiers.get).asJava)
datasourceKey, }
datasourceKey,
ModelConstants.DNET_PID_TYPES,
ModelConstants.DNET_PID_TYPES,
dataInfo
)
var finalAlternativeIdentifiers: List[StructuredProperty] = List()
finalAlternativeIdentifiers = List(alternativeIdentifiers) ::: List(defaultAlternatedIdentifer)
instance.setAlternateIdentifier(finalAlternativeIdentifiers.asJava)
val access_rights_qualifier = val access_rights_qualifier =
OafMapperUtils.accessRight( OafMapperUtils.accessRight(