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

Merge branch 'beta' of https://code-repo.d4science.org/D-Net/dnet-hadoop into beta

This commit is contained in:
Claudio Atzori 2022-10-19 15:21:02 +02:00
parent bca4a61710 72f0d88d6c
commit ec39b84898
1 changed files with 64 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dhp-workflows/dhp-aggregation/src/main/scala/eu/dnetlib/dhp/datacite/DataciteToOAFTransformation.scala
View File

@ -98,8 +98,7 @@ object DataciteToOAFTransformation {
} }
/** /** This utility method indicates whether the embargo date has been reached
* This utility method indicates whether the embargo date has been reached
* @param embargo_end_date * @param embargo_end_date
* @return True if the embargo date has been reached, false otherwise * @return True if the embargo date has been reached, false otherwise
*/ */
@ -147,7 +146,7 @@ object DataciteToOAFTransformation {
} }
} }
/*** /** *
* Use the vocabulary dnet:publication_resource to find a synonym to one of these terms and get the instance.type. * Use the vocabulary dnet:publication_resource to find a synonym to one of these terms and get the instance.type.
* Using the dnet:result_typologies vocabulary, we look up the instance.type synonym * Using the dnet:result_typologies vocabulary, we look up the instance.type synonym
* to generate one of the following main entities: * to generate one of the following main entities:
@ -155,7 +154,7 @@ object DataciteToOAFTransformation {
* - dataset * - dataset
* - software * - software
* - otherresearchproduct * - otherresearchproduct
*
* @param resourceType * @param resourceType
* @param resourceTypeGeneral * @param resourceTypeGeneral
* @param schemaOrg * @param schemaOrg
@ -413,7 +412,6 @@ object DataciteToOAFTransformation {
return List() return List()
result.setAuthor(authors.asJava) result.setAuthor(authors.asJava)
val titles: List[TitleType] = (json \\ "titles").extractOrElse[List[TitleType]](List()) val titles: List[TitleType] = (json \\ "titles").extractOrElse[List[TitleType]](List())
result.setTitle( result.setTitle(
@ -437,8 +435,6 @@ object DataciteToOAFTransformation {
.asJava .asJava
) )
val dates = (json \\ "dates").extract[List[DateType]] val dates = (json \\ "dates").extract[List[DateType]]
val publication_year = (json \\ "publicationYear").extractOrElse[String](null) val publication_year = (json \\ "publicationYear").extractOrElse[String](null)