forked from D-Net/dnet-hadoop
Merge branch 'beta' of https://code-repo.d4science.org/D-Net/dnet-hadoop into beta
This commit is contained in:
commit
ec39b84898
|
@ -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
|
||||||
*/
|
*/
|
||||||
|
@ -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)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue