Skip to content

Commit 4d565b7

Browse files
Merge remote-tracking branch 'origin/513-ActorsRelations' into 513-ActorsRelations
# Conflicts: # schemas/products/researchProductVersion.schema.tpl.json # schemas/products/softwareVersion.schema.tpl.json # schemas/products/webService.schema.tpl.json # schemas/products/webServiceVersion.schema.tpl.json
2 parents b628c7c + 7e724d7 commit 4d565b7

File tree

3 files changed

+24
-15
lines changed

3 files changed

+24
-15
lines changed

schemas/products/datasetVersion.schema.tpl.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,10 @@
5858
"core:File",
5959
"core:FileBundle",
6060
"core:WebResource",
61-
"https://openminds.ebrains.eu/sands/AnatomicalAtlas",
62-
"https://openminds.ebrains.eu/sands/AnatomicalAtlasVersion",
63-
"https://openminds.ebrains.eu/sands/CommonCoordinateFramework",
64-
"https://openminds.ebrains.eu/sands/CommonCoordinateFrameworkVersion"
61+
"sands:AnatomicalAtlas",
62+
"sands:AnatomicalAtlasVersion",
63+
"sands:CommonCoordinateFramework",
64+
"sands:CommonCoordinateFrameworkVersion"
6565
]
6666
},
6767
"isPrecededBy": {

schemas/products/researchProductVersion.schema.tpl.json

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,7 @@
1616
"accessibility": {
1717
"_instruction": "Add the accessibility of the data for this research product version.",
1818
"_linkedTypes": [
19-
"controlledTerms:Accessibility"
20-
]
21-
},
22-
"copyright": {
23-
"_instruction": "Enter the copyright information of this research product version.",
24-
"_embeddedTypes": [
25-
"core:Copyright"
19+
"core:Accessibility"
2620
]
2721
},
2822
"contribution": {
@@ -75,7 +69,7 @@
7569
"core:Funding"
7670
]
7771
},
78-
"homepage": {
72+
"homepage": {
7973
"type": "string",
8074
"_formats": [
8175
"iri"
@@ -87,14 +81,29 @@
8781
"_instruction": "Enter the preferred citation text for this research product version. Leave blank if citation text can be extracted from the assigned digital identifier."
8882
},
8983
"keyword": {
90-
"type": "array",
91-
"minItems": 1,
84+
"type": "array",
85+
"minItems": 1,
9286
"uniqueItems": true,
9387
"_instruction": "Add all relevant keywords to this research product version either by adding controlled terms or by suggesting new terms.",
9488
"_linkedCategories": [
9589
"keyword"
9690
]
9791
},
92+
"copyright": {
93+
"_instruction": "Enter the copyright information of this research product version.",
94+
"_embeddedTypes": [
95+
"core:Copyright"
96+
]
97+
},
98+
"otherContribution": {
99+
"type": "array",
100+
"minItems": 1,
101+
"uniqueItems": true,
102+
"_instruction": "Add any other contributions to this research product version that are not covered under 'author'/'developer' or 'custodian'.",
103+
"_embeddedTypes": [
104+
"core:Contribution"
105+
]
106+
},
98107
"publicationStatus": {
99108
"_instruction": "Add the relevant publication status indicating the current lifecycle state of the resource (published, embargoed, disposed, retracted, etc.).",
100109
"_linkedTypes": [

schemas/products/softwareVersion.schema.tpl.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"type": "array",
1313
"minItems": 1,
1414
"uniqueItems": true,
15-
"_instruction": "Add all dependencies of this software version.",
15+
"_instruction": "Add all operating devices compatible with this software version.",
1616
"_embeddedTypes": [
1717
"core:Dependency"
1818
]

0 commit comments

Comments
 (0)