Skip to content

Commit

Permalink
Merge pull request #338 from citation-file-format/legalname-revisited
Browse files Browse the repository at this point in the history 
Legalname revisited
  • Loading branch information
@jspaaks
jspaaks committed Jul 19, 2023
2 parents 8013e2a + 1fa696e commit fcaa9c1
Show file tree
Hide file tree
Showing 61 changed files with 156 additions and 156 deletions.
64 changes: 32 additions & 32 deletions src/cffconvert/cff_1_x_x/authors/schemaorg.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ def _from_affiliation_and_email(self):
'@type': 'Person',
'affiliation': {
'@type': 'Organization',
'legalName': self._author.get('affiliation')
'name': self._author.get('affiliation')
},
'email': self._author.get('email')
}
Expand All @@ -153,7 +153,7 @@ def _from_affiliation_and_orcid_and_email(self):
'@type': 'Person',
'affiliation': {
'@type': 'Organization',
'legalName': self._author.get('affiliation')
'name': self._author.get('affiliation')
},
'email': self._author.get('email')
}
Expand All @@ -170,7 +170,7 @@ def _from_alias_and_affiliation_and_email(self):
'@type': 'Person',
'affiliation': {
'@type': 'Organization',
'legalName': self._author.get('affiliation')
'name': self._author.get('affiliation')
},
'alternateName': self._author.get('alias'),
'email': self._author.get('email')
Expand All @@ -182,7 +182,7 @@ def _from_alias_and_affiliation_and_orcid_and_email(self):
'@type': 'Person',
'affiliation': {
'@type': 'Organization',
'legalName': self._author.get('affiliation')
'name': self._author.get('affiliation')
},
'alternateName': self._author.get('alias'),
'email': self._author.get('email')
Expand Down Expand Up @@ -231,7 +231,7 @@ def _from_given_and_affiliation_and_email(self):
'@type': 'Person',
'affiliation': {
'@type': 'Organization',
'legalName': self._author.get('affiliation')
'name': self._author.get('affiliation')
},
'givenName': self._author.get('given-names'),
'email': self._author.get('email')
Expand All @@ -243,7 +243,7 @@ def _from_given_and_affiliation_and_orcid_and_email(self):
'@type': 'Person',
'affiliation': {
'@type': 'Organization',
'legalName': self._author.get('affiliation')
'name': self._author.get('affiliation')
},
'givenName': self._author.get('given-names'),
'email': self._author.get('email')
Expand All @@ -262,7 +262,7 @@ def _from_given_and_alias_and_affiliation_and_email(self):
'@type': 'Person',
'affiliation': {
'@type': 'Organization',
'legalName': self._author.get('affiliation')
'name': self._author.get('affiliation')
},
'alternateName': self._author.get('alias'),
'givenName': self._author.get('given-names'),
Expand All @@ -275,7 +275,7 @@ def _from_given_and_alias_and_affiliation_and_orcid_and_email(self):
'@type': 'Person',
'affiliation': {
'@type': 'Organization',
'legalName': self._author.get('affiliation')
'name': self._author.get('affiliation')
},
'alternateName': self._author.get('alias'),
'givenName': self._author.get('given-names'),
Expand Down Expand Up @@ -304,7 +304,7 @@ def _from_given_and_last_and_affiliation_and_email(self):
'@type': 'Person',
'affiliation': {
'@type': 'Organization',
'legalName': self._author.get('affiliation')
'name': self._author.get('affiliation')
},
'familyName': self._get_full_last_name(),
'givenName': self._author.get('given-names'),
Expand All @@ -317,7 +317,7 @@ def _from_given_and_last_and_affiliation_and_orcid_and_email(self):
'@type': 'Person',
'affiliation': {
'@type': 'Organization',
'legalName': self._author.get('affiliation')
'name': self._author.get('affiliation')
},
'familyName': self._get_full_last_name(),
'givenName': self._author.get('given-names'),
Expand All @@ -338,7 +338,7 @@ def _from_given_and_last_and_alias_and_affiliation_and_email(self):
'@type': 'Person',
'affiliation': {
'@type': 'Organization',
'legalName': self._author.get('affiliation')
'name': self._author.get('affiliation')
},
'alternateName': self._author.get('alias'),
'familyName': self._get_full_last_name(),
Expand All @@ -352,7 +352,7 @@ def _from_given_and_last_and_alias_and_affiliation_and_orcid_and_email(self):
'@type': 'Person',
'affiliation': {
'@type': 'Organization',
'legalName': self._author.get('affiliation')
'name': self._author.get('affiliation')
},
'alternateName': self._author.get('alias'),
'familyName': self._get_full_last_name(),
Expand Down Expand Up @@ -399,7 +399,7 @@ def _from_last_and_affiliation_and_email(self):
'@type': 'Person',
'affiliation': {
'@type': 'Organization',
'legalName': self._author.get('affiliation')
'name': self._author.get('affiliation')
},
'familyName': self._get_full_last_name(),
'email': self._author.get('email')
Expand All @@ -411,7 +411,7 @@ def _from_last_and_affiliation_and_orcid_and_email(self):
'@type': 'Person',
'affiliation': {
'@type': 'Organization',
'legalName': self._author.get('affiliation')
'name': self._author.get('affiliation')
},
'familyName': self._get_full_last_name(),
'email': self._author.get('email')
Expand All @@ -430,7 +430,7 @@ def _from_last_and_alias_and_affiliation_and_email(self):
'@type': 'Person',
'affiliation': {
'@type': 'Organization',
'legalName': self._author.get('affiliation')
'name': self._author.get('affiliation')
},
'alternateName': self._author.get('alias'),
'familyName': self._get_full_last_name(),
Expand All @@ -443,7 +443,7 @@ def _from_last_and_alias_and_affiliation_and_orcid_and_email(self):
'@type': 'Person',
'affiliation': {
'@type': 'Organization',
'legalName': self._author.get('affiliation')
'name': self._author.get('affiliation')
},
'alternateName': self._author.get('alias'),
'familyName': self._get_full_last_name(),
Expand Down Expand Up @@ -494,7 +494,7 @@ def _from_affiliation(self):
'@type': 'Person',
'affiliation': {
'@type': 'Organization',
'legalName': self._author.get('affiliation')
'name': self._author.get('affiliation')
}
}

Expand All @@ -504,7 +504,7 @@ def _from_affiliation_and_orcid(self):
'@type': 'Person',
'affiliation': {
'@type': 'Organization',
'legalName': self._author.get('affiliation')
'name': self._author.get('affiliation')
}
}

Expand All @@ -519,7 +519,7 @@ def _from_alias_and_affiliation(self):
'@type': 'Person',
'affiliation': {
'@type': 'Organization',
'legalName': self._author.get('affiliation')
'name': self._author.get('affiliation')
},
'alternateName': self._author.get('alias'),
}
Expand All @@ -530,7 +530,7 @@ def _from_alias_and_affiliation_and_orcid(self):
'@type': 'Person',
'affiliation': {
'@type': 'Organization',
'legalName': self._author.get('affiliation')
'name': self._author.get('affiliation')
},
'alternateName': self._author.get('alias'),
}
Expand Down Expand Up @@ -568,7 +568,7 @@ def _from_given_and_affiliation(self):
'@type': 'Person',
'affiliation': {
'@type': 'Organization',
'legalName': self._author.get('affiliation')
'name': self._author.get('affiliation')
},
'givenName': self._author.get('given-names')
}
Expand All @@ -579,7 +579,7 @@ def _from_given_and_affiliation_and_orcid(self):
'@type': 'Person',
'affiliation': {
'@type': 'Organization',
'legalName': self._author.get('affiliation')
'name': self._author.get('affiliation')
},
'givenName': self._author.get('given-names')
}
Expand All @@ -596,7 +596,7 @@ def _from_given_and_alias_and_affiliation(self):
'@type': 'Person',
'affiliation': {
'@type': 'Organization',
'legalName': self._author.get('affiliation')
'name': self._author.get('affiliation')
},
'alternateName': self._author.get('alias'),
'givenName': self._author.get('given-names')
Expand All @@ -608,7 +608,7 @@ def _from_given_and_alias_and_affiliation_and_orcid(self):
'@type': 'Person',
'affiliation': {
'@type': 'Organization',
'legalName': self._author.get('affiliation')
'name': self._author.get('affiliation')
},
'alternateName': self._author.get('alias'),
'givenName': self._author.get('given-names')
Expand All @@ -634,7 +634,7 @@ def _from_given_and_last_and_affiliation(self):
'@type': 'Person',
'affiliation': {
'@type': 'Organization',
'legalName': self._author.get('affiliation')
'name': self._author.get('affiliation')
},
'familyName': self._get_full_last_name(),
'givenName': self._author.get('given-names')
Expand All @@ -646,7 +646,7 @@ def _from_given_and_last_and_affiliation_and_orcid(self):
'@type': 'Person',
'affiliation': {
'@type': 'Organization',
'legalName': self._author.get('affiliation')
'name': self._author.get('affiliation')
},
'familyName': self._get_full_last_name(),
'givenName': self._author.get('given-names')
Expand All @@ -665,7 +665,7 @@ def _from_given_and_last_and_alias_and_affiliation(self):
'@type': 'Person',
'affiliation': {
'@type': 'Organization',
'legalName': self._author.get('affiliation')
'name': self._author.get('affiliation')
},
'alternateName': self._author.get('alias'),
'familyName': self._get_full_last_name(),
Expand All @@ -678,7 +678,7 @@ def _from_given_and_last_and_alias_and_affiliation_and_orcid(self):
'@type': 'Person',
'affiliation': {
'@type': 'Organization',
'legalName': self._author.get('affiliation')
'name': self._author.get('affiliation')
},
'alternateName': self._author.get('alias'),
'familyName': self._get_full_last_name(),
Expand Down Expand Up @@ -720,7 +720,7 @@ def _from_last_and_affiliation(self):
'@type': 'Person',
'affiliation': {
'@type': 'Organization',
'legalName': self._author.get('affiliation')
'name': self._author.get('affiliation')
},
'familyName': self._get_full_last_name()
}
Expand All @@ -731,7 +731,7 @@ def _from_last_and_affiliation_and_orcid(self):
'@type': 'Person',
'affiliation': {
'@type': 'Organization',
'legalName': self._author.get('affiliation')
'name': self._author.get('affiliation')
},
'familyName': self._get_full_last_name()
}
Expand All @@ -748,7 +748,7 @@ def _from_last_and_alias_and_affiliation(self):
'@type': 'Person',
'affiliation': {
'@type': 'Organization',
'legalName': self._author.get('affiliation')
'name': self._author.get('affiliation')
},
'alternateName': self._author.get('alias'),
'familyName': self._get_full_last_name()
Expand All @@ -760,7 +760,7 @@ def _from_last_and_alias_and_affiliation_and_orcid(self):
'@type': 'Person',
'affiliation': {
'@type': 'Organization',
'legalName': self._author.get('affiliation')
'name': self._author.get('affiliation')
},
'alternateName': self._author.get('alias'),
'familyName': self._get_full_last_name()
Expand Down
4 changes: 2 additions & 2 deletions tests/cff_1_0_3/a/codemeta.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"@type": "Person",
"affiliation": {
"@type": "Organization",
"legalName": "Netherlands eScience Center"
"name": "Netherlands eScience Center"
},
"email": "my@email.notexist",
"familyName": "Spaaks",
Expand All @@ -16,7 +16,7 @@
"@type": "Person",
"affiliation": {
"@type": "Organization",
"legalName": "Netherlands eScience Center"
"name": "Netherlands eScience Center"
},
"familyName": "Klaver",
"givenName": "Tom"
Expand Down
4 changes: 2 additions & 2 deletions tests/cff_1_0_3/a/schemaorg.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"@type": "Person",
"affiliation": {
"@type": "Organization",
"legalName": "Netherlands eScience Center"
"name": "Netherlands eScience Center"
},
"email": "my@email.notexist",
"familyName": "Spaaks",
Expand All @@ -16,7 +16,7 @@
"@type": "Person",
"affiliation": {
"@type": "Organization",
"legalName": "Netherlands eScience Center"
"name": "Netherlands eScience Center"
},
"familyName": "Klaver",
"givenName": "Tom"
Expand Down
4 changes: 2 additions & 2 deletions tests/cff_1_0_3/a/test_codemeta_object.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ def test_author(self):
"@type": "Person",
"affiliation": {
"@type": "Organization",
"legalName": "Netherlands eScience Center"
"name": "Netherlands eScience Center"
},
"familyName": "Spaaks",
"givenName": "Jurriaan H.",
Expand All @@ -37,7 +37,7 @@ def test_author(self):
"@type": "Person",
"affiliation": {
"@type": "Organization",
"legalName": "Netherlands eScience Center"
"name": "Netherlands eScience Center"
},
"familyName": "Klaver",
"givenName": "Tom"
Expand Down
4 changes: 2 additions & 2 deletions tests/cff_1_0_3/a/test_schemaorg_object.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ def test_author(self):
"@type": "Person",
"affiliation": {
"@type": "Organization",
"legalName": "Netherlands eScience Center"
"name": "Netherlands eScience Center"
},
"familyName": "Spaaks",
"givenName": "Jurriaan H.",
Expand All @@ -37,7 +37,7 @@ def test_author(self):
"@type": "Person",
"affiliation": {
"@type": "Organization",
"legalName": "Netherlands eScience Center"
"name": "Netherlands eScience Center"
},
"familyName": "Klaver",
"givenName": "Tom"
Expand Down
4 changes: 2 additions & 2 deletions tests/cff_1_0_3/c/codemeta.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"@type": "Person",
"affiliation": {
"@type": "Organization",
"legalName": "Netherlands eScience Center"
"name": "Netherlands eScience Center"
},
"familyName": "Attema",
"givenName": "Jisk"
Expand All @@ -16,7 +16,7 @@
"@type": "Person",
"affiliation": {
"@type": "Organization",
"legalName": "Netherlands eScience Center"
"name": "Netherlands eScience Center"
},
"familyName": "Diblen",
"givenName": "Faruk"
Expand Down
4 changes: 2 additions & 2 deletions tests/cff_1_0_3/c/schemaorg.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"@type": "Person",
"affiliation": {
"@type": "Organization",
"legalName": "Netherlands eScience Center"
"name": "Netherlands eScience Center"
},
"familyName": "Attema",
"givenName": "Jisk"
Expand All @@ -16,7 +16,7 @@
"@type": "Person",
"affiliation": {
"@type": "Organization",
"legalName": "Netherlands eScience Center"
"name": "Netherlands eScience Center"
},
"familyName": "Diblen",
"givenName": "Faruk"
Expand Down
Loading

0 comments on commit fcaa9c1

Please sign in to comment.