Merge branch 'main' of github.com:caltechlibrary/irdmtools into gh-pages

caltechlibrary · Feb 22, 2024 · 81ed10b · 81ed10b
2 parents 6caedf9 + 116f1b9
commit 81ed10b
Show file tree

Hide file tree

Showing 18 changed files with 94 additions and 74 deletions.
diff --git a/crossref.go b/crossref.go
@@ -456,7 +456,7 @@ func getApproved(work *crossrefapi.Works) *simplified.DateType {
 func normalizePublisherName(val string, work *crossrefapi.Works, options *Doi2RdmOptions) string {
 	doi := getDOI(work)
 	if doi != "" {
-		doiPrefix, _ := DoiPrefix(val)
+		doiPrefix, _ := DoiPrefix(doi)
 		if value, ok := options.DoiPrefixPublishers[doiPrefix]; ok {
 			return value
 		}

diff --git a/doi2rdm.1.md b/doi2rdm.1.md
@@ -1,4 +1,4 @@
-%doi2rdm(1) irdmtools user manual | version 0.0.70 2d224184
+%doi2rdm(1) irdmtools user manual | version 0.0.70 f764f62d
 % R. S. Doiel and Tom Morrell
 % 2024-02-22
 

diff --git a/doi2rdm.go b/doi2rdm.go
@@ -80,72 +80,72 @@ mailto: [email protected]
 dot_initials: true
 # Map the CrossRef type to RDM type
 contributor_types:
-  author:           author
-  editor:           editor
-  reviewer:         reviewer
+  author: author
+  editor: editor
+  reviewer: reviewer
   review-assistent: other
-  stats-reviewer:   other
-  reader:           other
-  translator:       translator
+  stats-reviewer: other
+  reader: other
+  translator: translator
 # Map the CrossRef resource type to the RDM type
 resource_types:
-  article:           publication-article
-  journal-article:   publication-article
-  book:              publication-book
-  book_section:      publication-section
-  book-chapter:      publication-section
-  conference_item:   conference-paper
+  article: publication-article
+  journal-article: publication-article
+  book: publication-book
+  book_section: publication-section
+  book-chapter: publication-section
+  conference_item: conference-paper
   proceedings-article: conference-paper
-  dataset:           dataset
-  experiment:        publication-deliverable
-  journal_issue:     publication-issue
-  lab_notes:         labnotebook
-  monograph:         publication-report
-  oral_history:      publication-oralhistory
-  patent:            publication-patent
-  software:          software
+  dataset: dataset
+  experiment: publication-deliverable
+  journal_issue: publication-issue
+  lab_notes: labnotebook
+  monograph: publication-report
+  oral_history: publication-oralhistory
+  patent: publication-patent
+  software: software
   teaching_resource: teachingresource
-  thesis:            publication-thesis
-  video:             video
-  website:           other
-  other:             other
-  image:             other
-  report:            publication-workingpaper
-  report-component:  publication-workingpaper
-  posted-content:    publication-preprint
+  thesis: publication-thesis
+  video: video
+  website: other
+  other: other
+  image: other
+  report: publication-workingpaper
+  report-component: publication-workingpaper
+  posted-content: publication-preprint
 # Mapping DOI prefixes to Publisher names (used to normalize publisher names)
 doi_prefix_publishers:
-  10.1103:  American Physical Society
-  10.1063:  American Institute of Physics
-  10.1039:  Royal Society of Chemistry
-  10.1242:  Company of Biologists
-  10.1073:  PNAS
-  10.1109:  IEEE
-  10.2514:  AIAA
-  10.1029:  AGU (pre-Wiley hosting)
-  10.1093:  MNRAS
-  10.1046:  Geophysical Journal International
-  10.1175:  American Meteorological Society
-  10.1083:  Rockefeller University Press
-  10.1084:  Rockefeller University Press
-  10.1085:  Rockefeller University Press
+  10.1103: American Physical Society
+  10.1063: American Institute of Physics
+  10.1039: Royal Society of Chemistry
+  10.1242: Company of Biologists
+  10.1073: PNAS
+  10.1109: IEEE
+  10.2514: AIAA
+  10.1029: AGU (pre-Wiley hosting)
+  10.1093: MNRAS
+  10.1046: Geophysical Journal International
+  10.1175: American Meteorological Society
+  10.1083: Rockefeller University Press
+  10.1084: Rockefeller University Press
+  10.1085: Rockefeller University Press
   10.26508: Rockefeller University Press
-  10.1371:  PLOS
-  10.5194:  European Geosciences Union
-  10.1051:  EDP Sciences
-  10.2140:  Mathematical Sciences Publishers
-  10.1074:  ASBMB
-  10.1091:  ASCB
-  10.1523:  Society for Neuroscience
-  10.1101:  Cold Spring Harbor
-  10.1128:  American Society for Microbiology
-  10.1115:  ASME
-  10.1061:  ASCE
-  10.1038:  Nature
-  10.1126:  Science
-  10.1021:  American Chemical Society
-  10.1002:  Wiley
-  10.1016:  Elsevier
+  10.1371: PLOS
+  10.5194: European Geosciences Union
+  10.1051: EDP Sciences
+  10.2140: Mathematical Sciences Publishers
+  10.1074: ASBMB
+  10.1091: ASCB
+  10.1523: Society for Neuroscience
+  10.1101: Cold Spring Harbor
+  10.1128: American Society for Microbiology
+  10.1115: ASME
+  10.1061: ASCE
+  10.1038: Nature
+  10.1126: Science
+  10.1021: American Chemical Society
+  10.1002: Wiley
+  10.1016: Elsevier
 # Mapping ISSN prefixes to Publisher names (used to normalize publisher names)
 issn_publishers:
   0141-8130: Elsevier

diff --git a/doi_test.go b/doi_test.go
@@ -15,6 +15,7 @@ func TestDoiFuncs(t *testing.T) {
 	if expected != got {
 		t.Errorf("expected %q, got %q", expected, got)
 	}
+
 	expected = "10.48550"
 	got, err = DoiPrefix(input)
 	if err != nil {
@@ -24,4 +25,23 @@ func TestDoiFuncs(t *testing.T) {
 	if expected != got {
 		t.Errorf("expected %q, got %q", expected, got)
 	}
+
+	input = "10.1029/2022PA004571"
+	expected = "10.1029/2022PA004571"
+	got, err = LinkToDoi(input)
+	if err != nil {
+		t.Error(err)
+		t.FailNow()
+	}
+
+	expected = "10.1029"
+	got, err = DoiPrefix(input)
+	if err != nil {
+		t.Error(err)
+		t.FailNow()
+	}
+	if expected != got {
+		t.Errorf("expected %q, got %q", expected, got)
+	}
+
 }
diff --git a/ep3util.1.md b/ep3util.1.md
@@ -1,4 +1,4 @@
-%ep3util(1) irdmtools user manual | version 0.0.70 2d224184
+%ep3util(1) irdmtools user manual | version 0.0.70 f764f62d
 % R. S. Doiel and Tom Morrell
 % 2024-02-22
 

diff --git a/eprint2rdm.1.md b/eprint2rdm.1.md
@@ -1,4 +1,4 @@
-%eprint2rdm(1) irdmtools user manual | version 0.0.70 2d224184
+%eprint2rdm(1) irdmtools user manual | version 0.0.70 f764f62d
 % R. S. Doiel and Tom Morrell
 % 2024-02-22
 

diff --git a/eprintrest.1.md b/eprintrest.1.md
@@ -1,4 +1,4 @@
-%eprintrest(1) irdmtools user manual | version 0.0.70 2d224184
+%eprintrest(1) irdmtools user manual | version 0.0.70 f764f62d
 % R. S. Doiel and Tom Morrell
 % 2024-02-22
 

diff --git a/man/man1/doi2rdm.1 b/man/man1/doi2rdm.1
@@ -1,6 +1,6 @@
 .\" Automatically generated by Pandoc 3.1.12
 .\"
-.TH "doi2rdm" "1" "2024\-02\-22" "irdmtools user manual" "version 0.0.70 2d224184"
+.TH "doi2rdm" "1" "2024\-02\-22" "irdmtools user manual" "version 0.0.70 f764f62d"
 .SH NAME
 doi2rdm
 .SH SYNOPSIS

diff --git a/man/man1/ep3util.1 b/man/man1/ep3util.1
@@ -1,6 +1,6 @@
 .\" Automatically generated by Pandoc 3.1.12
 .\"
-.TH "ep3util" "1" "2024\-02\-22" "irdmtools user manual" "version 0.0.70 2d224184"
+.TH "ep3util" "1" "2024\-02\-22" "irdmtools user manual" "version 0.0.70 f764f62d"
 .SH NAME
 ep3util
 .SH SYNOPSIS

diff --git a/man/man1/eprint2rdm.1 b/man/man1/eprint2rdm.1
@@ -1,6 +1,6 @@
 .\" Automatically generated by Pandoc 3.1.12
 .\"
-.TH "eprint2rdm" "1" "2024\-02\-22" "irdmtools user manual" "version 0.0.70 2d224184"
+.TH "eprint2rdm" "1" "2024\-02\-22" "irdmtools user manual" "version 0.0.70 f764f62d"
 .SH NAME
 eprint2rdm
 .SH SYNOPSIS

diff --git a/man/man1/eprintrest.1 b/man/man1/eprintrest.1
@@ -1,6 +1,6 @@
 .\" Automatically generated by Pandoc 3.1.12
 .\"
-.TH "eprintrest" "1" "2024\-02\-22" "irdmtools user manual" "version 0.0.70 2d224184"
+.TH "eprintrest" "1" "2024\-02\-22" "irdmtools user manual" "version 0.0.70 f764f62d"
 .SH NAME
 eprintrest
 .SH SYNOPSIS

diff --git a/man/man1/people2vocabulary.1 b/man/man1/people2vocabulary.1
@@ -1,6 +1,6 @@
 .\" Automatically generated by Pandoc 3.1.12
 .\"
-.TH "people2vocabulary" "1" "2024\-02\-22" "irdmtools user manual" "version 0.0.70 2d224184"
+.TH "people2vocabulary" "1" "2024\-02\-22" "irdmtools user manual" "version 0.0.70 f764f62d"
 .SH NAME
 people2vocabulary
 .SH SYNOPSIS

diff --git a/man/man1/rdm2eprint.1 b/man/man1/rdm2eprint.1
@@ -1,6 +1,6 @@
 .\" Automatically generated by Pandoc 3.1.12
 .\"
-.TH "rdm2eprint" "1" "2024\-02\-22" "irdmtools user manual" "version 0.0.70 2d224184"
+.TH "rdm2eprint" "1" "2024\-02\-22" "irdmtools user manual" "version 0.0.70 f764f62d"
 .SH NAME
 rdm2eprint
 .SH SYNOPSIS

diff --git a/man/man1/rdmutil.1 b/man/man1/rdmutil.1
@@ -1,6 +1,6 @@
 .\" Automatically generated by Pandoc 3.1.12
 .\"
-.TH "rdmutil" "1" "2024\-02\-22" "irdmtools user manual" "version 0.0.70 2d224184"
+.TH "rdmutil" "1" "2024\-02\-22" "irdmtools user manual" "version 0.0.70 f764f62d"
 .SH NAME
 rdmutil
 .SH SYNOPSIS

diff --git a/people2vocabulary.1.md b/people2vocabulary.1.md
@@ -1,4 +1,4 @@
-%people2vocabulary(1) irdmtools user manual | version 0.0.70 2d224184
+%people2vocabulary(1) irdmtools user manual | version 0.0.70 f764f62d
 % R. S. Doiel
 % 2024-02-22
 

diff --git a/rdm2eprint.1.md b/rdm2eprint.1.md
@@ -1,4 +1,4 @@
-%rdm2eprint(1) irdmtools user manual | version 0.0.70 2d224184
+%rdm2eprint(1) irdmtools user manual | version 0.0.70 f764f62d
 % R. S. Doiel and Tom Morrell
 % 2024-02-22
 

diff --git a/rdmutil.1.md b/rdmutil.1.md
@@ -1,4 +1,4 @@
-%rdmutil(1) irdmtools user manual | version 0.0.70 2d224184
+%rdmutil(1) irdmtools user manual | version 0.0.70 f764f62d
 % R. S. Doiel and Tom Morrell
 % 2024-02-22
 

diff --git a/version.go b/version.go
@@ -12,7 +12,7 @@ const (
     ReleaseDate = "2024-02-22"
 
     // ReleaseHash, the Git hash when version.go was generated
-    ReleaseHash = "2d224184"
+    ReleaseHash = "f764f62d"
 
     LicenseText = `
 Redistribution and use in source and binary forms, with or without