Skip to content

Commit a09ba59

Browse files
Raphael-GazzottiRaphael-Gazzotti
committed
Merge remote-tracking branch 'origin/dataUsageAgreement' into dataUsageAgreement
# Conflicts: # schemas/data/usageAgreement.schema.tpl.json # schemas/miscellaneous/location.schema.tpl.json # schemas/products/datasetVersion.schema.tpl.json # schemas/products/metaDataModelVersion.schema.tpl.json # schemas/products/modelVersion.schema.tpl.json # schemas/products/webService.schema.tpl.json
2 parents 98a7fb8 + d901c10 commit a09ba59

18 files changed

+106
-126
lines changed

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,12 @@
44
"email"
55
],
66
"properties": {
7+
"address": {
8+
"_instruction": "Enter the physical address of the party (e.g., of the person).",
9+
"_linkedTypes": [
10+
"core:Location"
11+
]
12+
},
713
"email": {
814
"type": "string",
915
"_formats": [

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

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,17 @@
22
"_type": "core:Contribution",
33
"required": [
44
"contributor",
5-
"type"
5+
"role"
66
],
77
"properties": {
88
"contributor": {
99
"_instruction": "Add all types of contribution made by the stated 'contributor'.",
1010
"_linkedCategories": [
1111
"legalPerson"
1212
]
13-
},
14-
"type": {
15-
"type": "array",
16-
"minItems": 1,
17-
"uniqueItems": true,
18-
"_instruction": "Add the party that performed the contribution.",
13+
},
14+
"role": {
15+
"_instruction": "Add the role of the contributor that performed the contribution.",
1916
"_linkedTypes": [
2017
"controlledTerms:ContributionType"
2118
]

schemas/actors/affiliation.schema.tpl.json renamed to schemas/actors/membership.schema.tpl.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"_type": "core:Affiliation",
2+
"_type": "core:Membership",
33
"required": [
44
"memberOf"
55
],

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

Lines changed: 36 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,29 @@
44
"legalPerson"
55
],
66
"required": [
7-
"fullName"
7+
"address",
8+
"fullName",
9+
"type"
810
],
911
"properties": {
10-
"affiliation": {
12+
"address": {
13+
"_instruction": "Enter the physical address of this organization.",
14+
"_embeddedTypes": [
15+
"core:Jurisdiction"
16+
]
17+
},
18+
"acronym": {
19+
"type": "string",
20+
"_instruction": "Enter the acronym of this organization."
21+
},
22+
"alternateName": {
1123
"type": "array",
24+
"items": {
25+
"type": "string"
26+
},
1227
"minItems": 1,
1328
"uniqueItems": true,
14-
"_instruction": "Enter all current and, if necessary, past affiliations of this organization.",
15-
"_embeddedTypes": [
16-
"core:Affiliation"
17-
]
29+
"_instruction": "Enter any other known full name of this organization."
1830
},
1931
"digitalIdentifier": {
2032
"type": "array",
@@ -23,6 +35,8 @@
2335
"_instruction": "Add all globally unique and persistent digital identifier of this organization.",
2436
"_linkedTypes": [
2537
"core:GRIDID",
38+
"core:ISNI",
39+
"core:LEI",
2640
"core:RORID",
2741
"core:RRID"
2842
]
@@ -47,9 +61,25 @@
4761
],
4862
"_instruction": "Enter the internationalized resource identifier (IRI) to the homepage of this organization."
4963
},
64+
"memberOf": {
65+
"type": "array",
66+
"minItems": 1,
67+
"uniqueItems": true,
68+
"_instruction": "Enter all current and, if necessary, past memberships of this organization.",
69+
"_embeddedTypes": [
70+
"core:Membership"
71+
]
72+
},
5073
"shortName": {
5174
"type": "string",
5275
"_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)."
76+
},
77+
"type": {
78+
"type": "string",
79+
"_instruction": "Enter the type of this organization (e.g., company, non-profit organization, government).",
80+
"_embeddedTypes": [
81+
"controlledTerms:LegalEntityType"
82+
]
5383
}
5484
}
5585
}

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

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,10 @@
55
"legalPerson"
66
],
77
"required": [
8+
"fullName",
89
"givenName"
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": {
@@ -54,9 +46,22 @@
5446
"type": "string",
5547
"_instruction": "Enter the family name of this person."
5648
},
49+
"fullName": {
50+
"type": "string",
51+
"_instruction": "Enter the full name of this person."
52+
},
5753
"givenName": {
5854
"type": "string",
5955
"_instruction": "Enter the given name of this person."
56+
},
57+
"memberOf": {
58+
"type": "array",
59+
"minItems": 1,
60+
"uniqueItems": true,
61+
"_instruction": "Enter all current and, if desired, past memberships of this person.",
62+
"_embeddedTypes": [
63+
"core:Membership"
64+
]
6065
}
6166
}
6267
}

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{
2+
"_type": "core:ISNI",
3+
"required": [
4+
"identifier"
5+
],
6+
"properties": {
7+
"identifier": {
8+
"type": "string",
9+
"pattern": "^https?://(www.)?isni.org/(isni/)?\\d{15}[\\dX]$)",
10+
"_instruction": "Enter the identifier for legal entities provided by the International Standard Name Identifier Assignment Agency ('International Standard Name Identifier'; ISNI) as an internationalized resource identifier (IRI) following the defined pattern (i.e., 'https://isni.org/' + ISNI)."
11+
}
12+
}
13+
}

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{
2+
"_type": "core:LEI",
3+
"required": [
4+
"identifier"
5+
],
6+
"properties": {
7+
"identifier": {
8+
"type": "string",
9+
"pattern": "^https://lei.global/LEI/[A-Z0-9]{18}\\d{2}$",
10+
"_instruction": "Enter the identifier for legal entities provided by a local operating unit delegated by the Global Legal Entity Identifier Foundation ('Legal Entity Identifier'; LEI) as an internationalized resource identifier (IRI) following the defined pattern (i.e., 'https://lei.global/LEI/' + LEI)."
11+
}
12+
}
13+
}

‎schemas/products/dataset.schema.tpl.json‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,7 @@
11
{
22
"_type": "core:Dataset",
33
"_extends": "products/researchProduct.schema.tpl.json",
4-
"required": [
5-
"author"
6-
],
74
"properties": {
8-
"author": {
9-
"type": "array",
10-
"minItems": 1,
11-
"uniqueItems": true,
12-
"_instruction": "Add all parties that contributed to this dataset as authors.",
13-
"_linkedCategories": [
14-
"legalPerson"
15-
]
16-
},
175
"digitalIdentifier": {
186
"_instruction": "Add the globally unique and persistent digital identifier of this research product. Note that this digital identifier will be used to reference all attached research product versions.",
197
"_linkedTypes": [

‎schemas/products/metaDataModel.schema.tpl.json‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,7 @@
11
{
22
"_type": "core:MetaDataModel",
33
"_extends": "products/researchProduct.schema.tpl.json",
4-
"required": [
5-
"developer"
6-
],
74
"properties": {
8-
"developer": {
9-
"type": "array",
10-
"minItems": 1,
11-
"uniqueItems": true,
12-
"_instruction": "Add all parties that developed this (meta)data model.",
13-
"_linkedCategories": [
14-
"legalPerson"
15-
]
16-
},
175
"digitalIdentifier": {
186
"_instruction": "Add the globally unique and persistent digital identifier of this research product. Note that this digital identifier will be used to reference all attached research product versions.",
197
"_linkedTypes": [

‎schemas/products/metaDataModelVersion.schema.tpl.json‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,6 @@
4242
"core:MetaDataModel"
4343
]
4444
},
45-
"license": {
46-
"_instruction": "Add the license of this (meta)data model version.",
47-
"_linkedTypes": [
48-
"core:License"
49-
]
50-
},
5145
"serializationFormat": {
5246
"type": "array",
5347
"minItems": 1,

0 commit comments

Comments
 (0)