improve funding support in jsonfeed reader

Author: mfenner

cmd/root.go

@@ -13,7 +13,7 @@ import (
 // rootCmd represents the base command when called without any subcommands
 var rootCmd = &cobra.Command{
 	Use:     "commonmeta",
-	Version: "v0.12.1",
+	Version: "v0.13.0",
 	Short:   "Convert scholarly metadata between formats",
 	Long: `Convert scholarly metadata between formats. Currently
 supported formats include Crossref, DataCite, Schema.org, CSL, InvenioRDM,

commonmeta/reader.go

@@ -310,7 +310,7 @@ type FundingReference struct {
 	FunderName           string `json:"funderName,omitempty"`
 	AwardNumber          string `json:"awardNumber,omitempty"`
 	AwardTitle           string `json:"awardTitle,omitempty"`
-	AwardURI             string `json:"award_uri,omitempty"`
+	AwardURI             string `json:"awardUri,omitempty"`
 }
 
 // GeoLocation represents the geographical location of a publication, defined in the commonmeta JSON Schema.

inveniordm/writer.go

@@ -15,6 +15,7 @@ import (
 	"time"
 
 	"github.com/front-matter/commonmeta/commonmeta"
+	"github.com/front-matter/commonmeta/crossrefxml"
 	"github.com/front-matter/commonmeta/dateutils"
 	"github.com/front-matter/commonmeta/doiutils"
 	"github.com/front-matter/commonmeta/roguescholar"
@@ -201,18 +202,17 @@ func Convert(data commonmeta.Data) (Inveniordm, error) {
 
 	if len(data.FundingReferences) > 0 {
 		for _, v := range data.FundingReferences {
-			// id, identifierType := utils.ValidateID(v.FunderIdentifier)
+			id, identifierType := utils.ValidateID(v.FunderIdentifier)
 
 			// convert Open Funder Registry DOI to ROR using mapping file
-			// don't include ROR ID for now, as records may be rejected if not found in the InvenioRDM instance
-			// if identifierType == "Crossref Funder ID" {
-			// 	id = crossrefxml.OFRToRORMappings[v.FunderIdentifier]
-			// }
-			// if id != "" {
-			// 	id, _ = utils.ValidateROR(id)
-			// }
+			if identifierType == "Crossref Funder ID" {
+				id = crossrefxml.OFRToRORMappings[v.FunderIdentifier]
+			}
+			if id != "" {
+				id, _ = utils.ValidateROR(id)
+			}
 			funder := Funder{
-				// ID:   id,
+				ID:   id,
 				Name: v.FunderName,
 			}
 			var award Award

jsonfeed/reader.go

@@ -31,28 +31,29 @@ type Query struct {
 
 // Content represents the JSON Feed metadata.
 type Content struct {
-	ID            string      `json:"id"`
-	DOI           string      `json:"doi"`
-	GUID          string      `json:"guid"`
-	RID           string      `json:"rid"`
-	Abstract      string      `json:"abstract"`
-	ArchiveURL    string      `json:"archive_url"`
-	Authors       Authors     `json:"authors"`
-	Blog          Blog        `json:"blog"`
-	BlogName      string      `json:"blog_name"`
-	BlogSlug      string      `json:"blog_slug"`
-	ContentText   string      `json:"content_text"`
-	FeatureImage  string      `json:"image"`
-	IndexedAt     int64       `json:"indexed_at"`
-	Language      string      `json:"language"`
-	PublishedAt   int64       `json:"published_at"`
-	Relationships []Relation  `json:"relationships"`
-	Reference     []Reference `json:"reference"`
-	Summary       string      `json:"summary"`
-	Tags          []string    `json:"tags"`
-	Title         string      `json:"title"`
-	UpdatedAt     int64       `json:"updated_at"`
-	URL           string      `json:"url"`
+	ID                string             `json:"id"`
+	DOI               string             `json:"doi"`
+	GUID              string             `json:"guid"`
+	RID               string             `json:"rid"`
+	Abstract          string             `json:"abstract"`
+	ArchiveURL        string             `json:"archive_url"`
+	Authors           Authors            `json:"authors"`
+	Blog              Blog               `json:"blog"`
+	BlogName          string             `json:"blog_name"`
+	BlogSlug          string             `json:"blog_slug"`
+	ContentText       string             `json:"content_text"`
+	FeatureImage      string             `json:"image"`
+	IndexedAt         int64              `json:"indexed_at"`
+	Language          string             `json:"language"`
+	PublishedAt       int64              `json:"published_at"`
+	Relationships     []Relation         `json:"relationships"`
+	Reference         []Reference        `json:"reference"`
+	FundingReferences []FundingReference `json:"funding_references"`
+	Summary           string             `json:"summary"`
+	Tags              []string           `json:"tags"`
+	Title             string             `json:"title"`
+	UpdatedAt         int64              `json:"updated_at"`
+	URL               string             `json:"url"`
 }
 
 // Affiliation represents an affiliation in the JSON Feed item.
@@ -92,6 +93,16 @@ type Funding struct {
 	FunderName  string `json:"funder_name"`
 }
 
+// FundingReference represents the funding reference of a publication, defined in the commonmeta JSON Schema.
+type FundingReference struct {
+	FunderIdentifier     string `json:"funderIdentifier,omitempty"`
+	FunderIdentifierType string `json:"funderIdentifierType,omitempty"`
+	FunderName           string `json:"funderName,omitempty"`
+	AwardNumber          string `json:"awardNumber,omitempty"`
+	AwardTitle           string `json:"awardTitle,omitempty"`
+	AwardURI             string `json:"awardUri,omitempty"`
+}
+
 // Relation represents a relation in the JSON Feed item.
 type Relation struct {
 	Type string   `json:"type"`
@@ -559,6 +570,18 @@ func GetFundingReferences(content Content) []commonmeta.FundingReference {
 			AwardNumber:          content.Blog.Funding.AwardNumber,
 			AwardURI:             content.Blog.Funding.AwardURI,
 		})
+	}
+	if len(content.FundingReferences) > 0 {
+		for _, v := range content.FundingReferences {
+			fundingReferences = append(fundingReferences, commonmeta.FundingReference{
+				FunderName:           v.FunderName,
+				FunderIdentifier:     v.FunderIdentifier,
+				FunderIdentifierType: v.FunderIdentifierType,
+				AwardTitle:           v.AwardTitle,
+				AwardNumber:          v.AwardNumber,
+				AwardURI:             v.AwardURI,
+			})
+		}
 	} else {
 		// Funding references from relationships
 		for _, v := range content.Relationships {