Skip to content

Commit d093056

Browse files
lzehllzehl
authored
Merge pull request #561 from Raphael-Gazzotti/513-ActorsRelations
Draft for #513: Update of Actors, ResearchProducts,ResearchProductVersions, DigitalIdentifiers and their relationships.
2 parents c191d94 + 6f9dde1 commit d093056

32 files changed

+289
-250
lines changed

‎schemas/actors/affiliation.schema.tpl.json‎

Lines changed: 13 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,24 @@
11
{
22
"_type": "core:Affiliation",
33
"required": [
4-
"memberOf"
4+
"person",
5+
"organization"
56
],
67
"properties": {
7-
"endDate": {
8-
"type": "string",
9-
"_formats": [
10-
"date"
11-
],
12-
"_instruction": "Enter the end date of this affiliation, formatted as 'YYYY-MM-DD'. Leave blank if this affiliation is still current."
8+
"person": {
9+
"_instruction": "Add the individual to whom this affiliation belongs.",
10+
"_linkedTypes": [
11+
"core:Person"
12+
]
1313
},
14-
"memberOf": {
15-
"_instruction": "Add the organization or consortium another party was or still is a member of.",
16-
"_linkedTypes": [
17-
"core:Consortium",
14+
"organization": {
15+
"type": "array",
16+
"minItems": 1,
17+
"uniqueItems": true,
18+
"_instruction": "Add all organizations (in display order) with which the specified individual is affiliated.",
19+
"_linkedTypes": [
1820
"core:Organization"
1921
]
20-
},
21-
"startDate": {
22-
"type": "string",
23-
"_formats": [
24-
"date"
25-
],
26-
"_instruction": "Enter the start date of this affiliation, formatted as 'YYYY-MM-DD'."
2722
}
2823
}
2924
}

‎schemas/actors/consortium.schema.tpl.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"_type": "core:Consortium",
33
"_categories": [
4-
"legalPerson"
4+
"actor"
55
],
66
"required": [
77
"fullName"

‎schemas/actors/contactInformation.schema.tpl.json‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,16 @@
55
],
66
"properties": {
77
"email": {
8-
"type": "string",
9-
"_formats": [
10-
"email"
11-
],
12-
"_instruction": "Enter the email address of the party (e.g., of the person)."
8+
"type": "array",
9+
"items": {
10+
"type": "string",
11+
"_formats": [
12+
"email"
13+
]
14+
},
15+
"minItems": 1,
16+
"uniqueItems": true,
17+
"_instruction": "Enter all relevant contact email addresses."
1318
}
1419
}
1520
}

‎schemas/actors/contribution.schema.tpl.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@
66
],
77
"properties": {
88
"contributor": {
9-
"_instruction": "Add all types of contribution made by the stated 'contributor'.",
10-
"_linkedCategories": [
11-
"legalPerson"
12-
]
13-
},
14-
"type": {
159
"type": "array",
1610
"minItems": 1,
1711
"uniqueItems": true,
18-
"_instruction": "Add the party that performed the contribution.",
12+
"_instruction": "Add all contributors who made this contribution, in the desired display order.",
13+
"_linkedCategories": [
14+
"actor"
15+
]
16+
},
17+
"type": {
18+
"_instruction": "Add the type of contribution.",
1919
"_linkedTypes": [
2020
"controlledTerms:ContributionType"
2121
]

‎schemas/actors/organization.schema.tpl.json‎

Lines changed: 39 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,48 @@
11
{
22
"_type": "core:Organization",
33
"_categories": [
4+
"actor",
45
"legalPerson"
56
],
67
"required": [
7-
"fullName"
8+
"countryOfFormation",
9+
"name",
10+
"type"
811
],
912
"properties": {
10-
"affiliation": {
13+
"acronym": {
14+
"type": "string",
15+
"_instruction": "Enter the acronym of this organization."
16+
},
17+
"alternateName": {
1118
"type": "array",
19+
"items": {
20+
"type": "string"
21+
},
1222
"minItems": 1,
1323
"uniqueItems": true,
14-
"_instruction": "Enter all current and, if necessary, past affiliations of this organization.",
15-
"_embeddedTypes": [
16-
"core:Affiliation"
24+
"_instruction": "Enter any other known name or acronym of this organization."
25+
},
26+
"countryOfFormation": {
27+
"_instruction": "Add the country where the organization was formed.",
28+
"_linkedTypes": [
29+
"controlledTerms:SovereignState"
1730
]
1831
},
1932
"digitalIdentifier": {
2033
"type": "array",
2134
"minItems": 1,
2235
"uniqueItems": true,
2336
"_instruction": "Add all globally unique and persistent digital identifier of this organization.",
24-
"_linkedTypes": [
25-
"core:GRIDID",
26-
"core:RORID",
27-
"core:RRID"
37+
"_linkedCategories": [
38+
"organizationIdentifier"
2839
]
2940
},
30-
"fullName": {
31-
"type": "string",
32-
"_instruction": "Enter the full name of this organization."
41+
"location": {
42+
"_instruction": "Add the headquarters location of this organization.",
43+
"_embeddedTypes": [
44+
"core:Location"
45+
]
3346
},
3447
"hasParent": {
3548
"type": "array",
@@ -47,9 +60,21 @@
4760
],
4861
"_instruction": "Enter the internationalized resource identifier (IRI) to the homepage of this organization."
4962
},
50-
"shortName": {
63+
"jurisdiction": {
64+
"_instruction": "Add the jurisdiction under which the organization operates.",
65+
"_linkedCategories": [
66+
"jurisdiction"
67+
]
68+
},
69+
"name": {
5170
"type": "string",
52-
"_instruction": "Enter a short name (or alias) for this organization that could be used as a shortened display title (e.g., for web services with too little space to display the full name)."
71+
"_instruction": "Enter the organization’s preferred name for use in international contexts."
72+
},
73+
"type": {
74+
"_instruction": "Add the type of this organization (legal entity or organizational unit).",
75+
"_embeddedTypes": [
76+
"controlledTerms:OrganizationType"
77+
]
5378
}
5479
}
5580
}

‎schemas/actors/person.schema.tpl.json‎

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,14 @@
11
{
22
"_type": "core:Person",
33
"_categories": [
4+
"actor",
45
"agent",
56
"legalPerson"
67
],
78
"required": [
8-
"givenName"
9+
"preferredName"
910
],
10-
"properties": {
11-
"affiliation": {
12-
"type": "array",
13-
"minItems": 1,
14-
"uniqueItems": true,
15-
"_instruction": "Enter all current and, if desired, past affiliations of this person.",
16-
"_embeddedTypes": [
17-
"core:Affiliation"
18-
]
19-
},
11+
"properties": {
2012
"alternateName": {
2113
"type": "array",
2214
"items": {
@@ -46,17 +38,21 @@
4638
"minItems": 1,
4739
"uniqueItems": true,
4840
"_instruction": "Add all globally unique and persistent digital identifier of this person.",
49-
"_linkedTypes": [
50-
"core:ORCID"
41+
"_linkedCategories": [
42+
"personIdentifier"
5143
]
5244
},
5345
"familyName": {
5446
"type": "string",
55-
"_instruction": "Enter the family name of this person."
47+
"_instruction": "Enter the family name, surname, or equivalent of this person."
5648
},
5749
"givenName": {
5850
"type": "string",
59-
"_instruction": "Enter the given name of this person."
51+
"_instruction": "Enter the given name(s) of this person, or a name chosen in place of the given name. At least one of the names should be spelled out in full; initials may be used for the others."
52+
},
53+
"preferredName": {
54+
"type": "string",
55+
"_instruction": "Enter the person’s preferred way to write their name in a professional context. It is recommended to place given before family name separated by space."
6056
}
6157
}
6258
}

‎schemas/data/file.schema.tpl.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"_type": "core:File",
33
"_categories": [
4+
"documentationResource",
45
"fileOrigin"
56
],
67
"required": [

‎schemas/data/serviceLink.schema.tpl.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"core:FileBundle",
1515
"core:ModelVersion",
1616
"publications:LivePaperResourceItem",
17-
"https://openminds.ebrains.eu/sands/ParcellationEntityVersion"
17+
"sands:ParcellationEntityVersion"
1818
]
1919
},
2020
"displayLabel": {

‎schemas/digitalIdentifier/DOI.schema.tpl.json‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
{
22
"_type": "core:DOI",
33
"_categories": [
4-
"publicationReference"
4+
"datasetIdentifier",
5+
"documentationResource",
6+
"publicationReference",
7+
"toolIdentifier"
58
],
69
"required": [
710
"identifier"

‎schemas/digitalIdentifier/GRIDID.schema.tpl.json‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

0 commit comments

Comments
 (0)