handle missing affiliations in crossrefxml writer

front-matter · May 13, 2024 · 42db45d · 42db45d
1 parent 2e59234
commit 42db45d
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 29 deletions.
diff --git a/cmd/version.go b/cmd/version.go
@@ -15,7 +15,7 @@ var versionCmd = &cobra.Command{
 	Short: "Print the version number of commonmeta",
 	Long:  `All software has versions. This is commonmeta's`,
 	Run: func(cmd *cobra.Command, args []string) {
-		fmt.Println("Commonmeta v0.3.5 -- HEAD")
+		fmt.Println("Commonmeta v0.3.6 -- HEAD")
 	},
 }
 

diff --git a/crossrefxml/reader.go b/crossrefxml/reader.go
@@ -98,7 +98,7 @@ type Affiliation struct {
 
 type Affiliations struct {
 	XMLName     xml.Name      `xml:"affiliations"`
-	Institution []Institution `xml:"institution"`
+	Institution []Institution `xml:"institution,omitempty"`
 }
 
 type ApprovalDate struct {
@@ -334,7 +334,7 @@ type Format struct {
 
 type Institution struct {
 	XMLName          xml.Name       `xml:"institution"`
-	InstitutionName  string         `xml:"institution_name"`
+	InstitutionName  string         `xml:"institution_name,omitempty"`
 	InstitutionPlace string         `xml:"institution_place,omitempty"`
 	InstitutionID    *InstitutionID `xml:"institution_id,omitempty"`
 }

diff --git a/crossrefxml/writer.go b/crossrefxml/writer.go
@@ -102,36 +102,46 @@ func Convert(data commonmeta.Data) (Crossref, error) {
 			if i > 0 {
 				sequence = "additional"
 			}
-			institution := []Institution{}
-			for _, a := range contributor.Affiliations {
-				if a.Name != "" {
-					if a.ID != "" {
-						institutionID := &InstitutionID{
-							IDType: "ror",
-							Text:   a.ID,
+			if len(contributor.Affiliations) > 0 {
+				institution := []Institution{}
+				for _, a := range contributor.Affiliations {
+					if a.Name != "" {
+						if a.ID != "" {
+							institutionID := &InstitutionID{
+								IDType: "ror",
+								Text:   a.ID,
+							}
+							institution = append(institution, Institution{
+								InstitutionID:   institutionID,
+								InstitutionName: a.Name,
+							})
+						} else {
+							institution = append(institution, Institution{
+								InstitutionName: a.Name,
+							})
 						}
-						institution = append(institution, Institution{
-							InstitutionID:   institutionID,
-							InstitutionName: a.Name,
-						})
-					} else {
-						institution = append(institution, Institution{
-							InstitutionName: a.Name,
-						})
 					}
 				}
+				affiliations := &Affiliations{
+					Institution: institution,
+				}
+				personName = append(personName, PersonName{
+					ContributorRole: contributorRole,
+					Sequence:        sequence,
+					ORCID:           contributor.ID,
+					GivenName:       contributor.GivenName,
+					Surname:         contributor.FamilyName,
+					Affiliations:    affiliations,
+				})
+			} else {
+				personName = append(personName, PersonName{
+					ContributorRole: contributorRole,
+					Sequence:        sequence,
+					ORCID:           contributor.ID,
+					GivenName:       contributor.GivenName,
+					Surname:         contributor.FamilyName,
+				})
 			}
-			affiliations := &Affiliations{
-				Institution: institution,
-			}
-			personName = append(personName, PersonName{
-				ContributorRole: contributorRole,
-				Sequence:        sequence,
-				ORCID:           contributor.ID,
-				GivenName:       contributor.GivenName,
-				Surname:         contributor.FamilyName,
-				Affiliations:    affiliations,
-			})
 		}
 	}