Skip to content

Commit 2d35256

Browse files
author
R. S. Doiel
committed
Merge branch 'main' of github.com:caltechlibrary/irdmtools into gh-pages
2 parents 501f0b4 + f9ad010 commit 2d35256

28 files changed

Lines changed: 69 additions & 53 deletions

‎CITATION.cff‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ authors:
1414

1515

1616
repository-code: "https://github.com/caltechlibrary/irdmtools"
17-
version: 0.0.94
17+
version: 0.0.95
1818
license-url: "https://caltechlibrary.github.io/irdmtools/LICENSE"
1919
keywords: [ "institutional repository", "data
2020
management", "Invenio", "Invenio-RDM" ]
21-
date-released: 2025-10-16
21+
date-released: 2025-11-19

‎TODO.html‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@
2525
</nav>
2626
<section>
2727
<h1 id="action-items">Action Items</h1>
28+
<p>Project TODOS: <a
29+
href="https://github.com/orgs/caltechlibrary/projects/3/views/5?filterQuery=status%3A%22Next%22%2C%22In%20Progress%22%20assignee%3Arsdoiel"
30+
class="uri">https://github.com/orgs/caltechlibrary/projects/3/views/5?filterQuery=status%3A%22Next%22%2C%22In%20Progress%22%20assignee%3Arsdoiel</a></p>
2831
<h2 id="bugs">Bugs</h2>
2932
<ul class="task-list">
3033
<li><label><input type="checkbox" />ep3ds2citations, citations from

‎TODO.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
Action Items
33
============
44

5+
Project TODOS: <https://github.com/orgs/caltechlibrary/projects/3/views/5?filterQuery=status%3A%22Next%22%2C%22In%20Progress%22%20assignee%3Arsdoiel>
6+
57
Bugs
68
----
79

‎about.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
</nav>
2626
<section>
2727
<h1 id="about-this-software">About this software</h1>
28-
<h2 id="irdmtools-0.0.94">irdmtools 0.0.94</h2>
28+
<h2 id="irdmtools-0.0.95">irdmtools 0.0.95</h2>
2929
<h3 id="authors">Authors</h3>
3030
<ul>
3131
<li>R. S. Doiel</li>

‎about.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,17 @@ authors:
1414
orcid: ""
1515

1616
repository-code: "https://github.com/caltechlibrary/irdmtools"
17-
version: 0.0.94
17+
version: 0.0.95
1818
license-url: "https://caltechlibrary.github.io/irdmtools/LICENSE"
1919
keywords: [ "institutional repository", "data
2020
management", "Invenio", "Invenio-RDM" ]
21-
date-released: 2025-10-16
21+
date-released: 2025-11-19
2222
---
2323

2424
About this software
2525
===================
2626

27-
## irdmtools 0.0.94
27+
## irdmtools 0.0.95
2828

2929
### Authors
3030

‎codemeta.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@
6161
}
6262
],
6363
"dateCreated": "2022-10-27",
64-
"dateModified": "2025-10-16",
65-
"datePublished": "2025-10-16",
64+
"dateModified": "2025-11-19",
65+
"datePublished": "2025-11-19",
6666
"description": "Tools for working with institutional repositories and data management systems. Current implementation targets Invenio-RDM.",
6767
"funder": "Caltech Library",
6868
"keywords": [
@@ -103,10 +103,10 @@
103103
"MySQL >= 8",
104104
"SQLite >= 3.49"
105105
],
106-
"version": "0.0.94",
106+
"version": "0.0.95",
107107
"developmentStatus": "active",
108108
"issueTracker": "https://github.com/caltechlibrary/irdmtools/issues",
109-
"releaseNotes": "- Fix issue #84, removed empty Title element for awards",
109+
"releaseNotes": "- Fix issue #85, upgrade to latest crossrefapi package, then added support for ROR as funder identifier.",
110110
"copyrightYear": 2025,
111111
"copyrightHolder": "California Institute of Technology"
112112
}

‎crossref.go‎

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -167,11 +167,19 @@ func getWorksFunding(work *crossrefapi.Works) []*simplified.Funder {
167167
ok bool
168168
)
169169
for _, funder := range work.Message.Funder {
170-
agency := &simplified.FunderIdentifier {
171-
Name: funder.Name,
170+
agency := &simplified.FunderIdentifier {}
171+
if funder.Name != "" {
172+
agency.Name = funder.Name
172173
}
173174
ror = ""
174-
if funder.DOI != "" && funder.DoiAssertedBy == "publisher" {
175+
if funder.Identifiers != nil && len(funder.Identifiers) > 0 {
176+
for _, identifier := range funder.Identifiers {
177+
if identifier.IdType == "ROR" && identifier.AssertedBy == "publisher" {
178+
ror = strings.TrimPrefix(identifier.Id, "https://ror.org/")
179+
}
180+
}
181+
}
182+
if ror == "" && funder.DOI != "" && funder.DoiAssertedBy == "publisher" {
175183
parts := strings.SplitN(funder.DOI, "/", 2)
176184
if len(parts) == 2 {
177185
suffix = strings.TrimSpace(parts[1])
@@ -189,12 +197,15 @@ func getWorksFunding(work *crossrefapi.Works) []*simplified.Funder {
189197
}
190198
if len(funder.Award) > 0 {
191199
for _, award := range funder.Award {
192-
funding = append(funding, &simplified.Funder{
193-
Funder: agency,
200+
grant := &simplified.Funder{
194201
Award: &simplified.AwardIdentifier{
195202
Number: award,
196203
},
197-
})
204+
}
205+
if agency.Name != "" || agency.Identifier != "" {
206+
grant.Funder = agency
207+
}
208+
funding = append(funding, grant)
198209
}
199210
} else {
200211
funding = append(funding, &simplified.Funder{

‎doi2rdm.1.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
%doi2rdm(1) irdmtools user manual | version 0.0.94 6f940e9b
1+
%doi2rdm(1) irdmtools user manual | version 0.0.95 05aae01b
22
% R. S. Doiel and Tom Morrell
3-
% 2025-10-16
3+
% 2025-11-19
44

55
# NAME
66

‎ep3ds2citations.1.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
%ep3ds2citations(1) irdmtools user manual | version 0.0.94 6f940e9b
1+
%ep3ds2citations(1) irdmtools user manual | version 0.0.95 05aae01b
22
% R. S. Doiel and Tom Morrell
3-
% 2025-10-16
3+
% 2025-11-19
44

55
# NAME
66

‎ep3util.1.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
%ep3util(1) irdmtools user manual | version 0.0.94 6f940e9b
1+
%ep3util(1) irdmtools user manual | version 0.0.95 05aae01b
22
% R. S. Doiel and Tom Morrell
3-
% 2025-10-16
3+
% 2025-11-19
44

55
# NAME
66

0 commit comments

Comments
 (0)