1
0
Fork 0

code formatted

This commit is contained in:
sandro.labruzzo 2024-12-04 13:37:14 +01:00
parent cc6bbbb804
commit 4034da7579
7 changed files with 82 additions and 70 deletions

View File

@ -1,3 +1,4 @@
package eu.dnetlib.dhp.sx.bio.pubmed; package eu.dnetlib.dhp.sx.bio.pubmed;
/** /**
@ -14,6 +15,7 @@ public class PMAffiliation {
public PMAffiliation() { public PMAffiliation() {
} }
public PMAffiliation(String name, PMIdentifier identifier) { public PMAffiliation(String name, PMIdentifier identifier) {
this.name = name; this.name = name;
this.identifier = identifier; this.identifier = identifier;

View File

@ -97,5 +97,4 @@ public class PMAuthor implements Serializable {
this.affiliation = affiliation; this.affiliation = affiliation;
} }
} }

View File

@ -1,3 +1,4 @@
package eu.dnetlib.dhp.sx.bio.pubmed; package eu.dnetlib.dhp.sx.bio.pubmed;
public class PMIdentifier { public class PMIdentifier {
@ -5,7 +6,6 @@ public class PMIdentifier {
private String pid; private String pid;
private String type; private String type;
public PMIdentifier(String pid, String type) { public PMIdentifier(String pid, String type) {
this.pid = cleanPid(pid); this.pid = cleanPid(pid);
this.type = type; this.type = type;

View File

@ -673,7 +673,6 @@ case object Crossref2Oaf {
val doi = input.getString(0) val doi = input.getString(0)
val rorId = input.getString(1) val rorId = input.getString(1)
val pubId = IdentifierFactory.idFromPid("50", "doi", DoiCleaningRule.clean(doi), true) val pubId = IdentifierFactory.idFromPid("50", "doi", DoiCleaningRule.clean(doi), true)
val affId = GenerateRorActionSetJob.calculateOpenaireId(rorId) val affId = GenerateRorActionSetJob.calculateOpenaireId(rorId)

View File

@ -88,7 +88,6 @@ class PMParser2 {
a.setIdentifier(new PMIdentifier(id, idType)) a.setIdentifier(new PMIdentifier(id, idType))
} }
val affiliation = (author \ "AffiliationInfo" \ "Affiliation").text val affiliation = (author \ "AffiliationInfo" \ "Affiliation").text
val affiliationId = (author \ "AffiliationInfo" \ "Identifier").text val affiliationId = (author \ "AffiliationInfo" \ "Identifier").text
val affiliationIdType = (author \ "AffiliationInfo" \ "Identifier" \ "@Source").text val affiliationIdType = (author \ "AffiliationInfo" \ "Identifier" \ "@Source").text
@ -96,7 +95,9 @@ class PMParser2 {
if (affiliation != null && affiliation.nonEmpty) { if (affiliation != null && affiliation.nonEmpty) {
val aff = new PMAffiliation() val aff = new PMAffiliation()
aff.setName(affiliation) aff.setName(affiliation)
if(affiliationId != null && affiliationId.nonEmpty && affiliationIdType != null && affiliationIdType.nonEmpty) { if (
affiliationId != null && affiliationId.nonEmpty && affiliationIdType != null && affiliationIdType.nonEmpty
) {
aff.setIdentifier(new PMIdentifier(affiliationId, affiliationIdType)) aff.setIdentifier(new PMIdentifier(affiliationId, affiliationIdType))
} }
a.setAffiliation(aff) a.setAffiliation(aff)

View File

@ -295,8 +295,20 @@ object PubMedToOaf {
author.setSurname(a.getLastName) author.setSurname(a.getLastName)
author.setFullname(a.getFullName) author.setFullname(a.getFullName)
if (a.getIdentifier != null) { if (a.getIdentifier != null) {
author.setPid(List(OafMapperUtils.structuredProperty(a.getIdentifier.getPid, author.setPid(
OafMapperUtils.qualifier(a.getIdentifier.getType,a.getIdentifier.getType,ModelConstants.DNET_PID_TYPES, ModelConstants.DNET_PID_TYPES), dataInfo)).asJava) List(
OafMapperUtils.structuredProperty(
a.getIdentifier.getPid,
OafMapperUtils.qualifier(
a.getIdentifier.getType,
a.getIdentifier.getType,
ModelConstants.DNET_PID_TYPES,
ModelConstants.DNET_PID_TYPES
),
dataInfo
)
).asJava
)
} }
if (a.getAffiliation != null) if (a.getAffiliation != null)
author.setRawAffiliationString(List(a.getAffiliation.getName).asJava) author.setRawAffiliationString(List(a.getAffiliation.getName).asJava)

View File

@ -63,7 +63,6 @@ class BioScholixTest extends AbstractVocabularyTest {
"0000000333457333", "0000000333457333",
"0000000335964515", "0000000335964515",
"0000000302921949", "0000000302921949",
"http://orcid.org/0000-0001-8567-3543", "http://orcid.org/0000-0001-8567-3543",
"http://orcid.org/0000-0001-7868-8528", "http://orcid.org/0000-0001-7868-8528",
"0000-0001-9189-1440", "0000-0001-9189-1440",