Skip to content
This repository has been archived by the owner on Sep 16, 2022. It is now read-only.

Commit

Permalink
Merge pull request #562 from CSCfi/stable
Browse files Browse the repository at this point in the history 
Merge stable to master: v1.6.0
  • Loading branch information
Katri Tegel authored Mar 30, 2020
2 parents 3c54b82 + 9e6c9a5 commit 1cf1bd3
Show file tree
Hide file tree
Showing 43 changed files with 1,692 additions and 1,050 deletions.
12 changes: 12 additions & 0 deletions src/metax_api/api/rest/base/api_schemas/datacatalog.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,18 @@
"maxItems":1,
"type":"string"
},
"catalog_record_services_edit":{
"title":"Editor services",
"description":"Comma-separated list of services which are allowed to edit catalog records in the catalog.",
"maxItems":1,
"type":"string"
},
"catalog_record_services_create":{
"title":"Creator services",
"description":"Comma-separated list of services which are allowed to add new catalog records to the catalog.",
"maxItems":1,
"type":"string"
},
"date_modified":{
"title":"Date Modified",
"description":"Date on which the resource was changed.",
Expand Down
7 changes: 4 additions & 3 deletions src/metax_api/api/rest/base/api_schemas/file.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,9 @@
},
"algorithm":{
"enum":[
"md5",
"sha2"
"MD5",
"SHA-256",
"SHA-512"
],
"type":"string"
},
Expand Down Expand Up @@ -376,4 +377,4 @@
]
},
}
}
}
200 changes: 106 additions & 94 deletions src/metax_api/api/rest/base/schemas/att_dataset_schema.json
View file

Large diffs are not rendered by default.

37 changes: 27 additions & 10 deletions src/metax_api/api/rest/base/schemas/datacatalog_schema.json
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@

{
"description":"This is a subset of https://tietomallit.suomi.fi/model/att that defines API to describe Research Data Catalogs in METAX",
"@id":"http://uri.suomi.fi/datamodel/ns/mdc#",
"title":"Metax Research Data Catalogs",
"modified":"Wed, 30 May 2018 07:39:45 GMT",
"modified":"Wed, 11 Mar 2020 11:53:03 GMT",
"$schema":"http://json-schema.org/draft-04/schema#",
"type":"object",
"allOf":[
Expand All @@ -17,12 +16,14 @@
"type":"object",
"@id":"http://www.w3.org/ns/dcat#Catalog",
"description":"A curated collection of metadata about datasets",
"minProperties":1,
"properties":{
"identifier":{
"@id":"http://purl.org/dc/terms/identifier",
"title":"Identifier",
"description":"Recommended best practice is to identify the resource by means of a string conforming to a formal identification system. \n\nAn unambiguous reference to the resource within a given context.",
"@type":"@id",
"minLength":1,
"type":"string",
"format":"uri"
},
Expand All @@ -39,23 +40,26 @@
"title":"Description",
"description":"A free-text account of the catalog",
"@type":"http://www.w3.org/2001/XMLSchema#string",
"minLength":1,
"type":"string"
},
"modified":{
"@id":"http://purl.org/dc/terms/modified",
"title":"Date Modified",
"description":"Date on which the Catalogue was last modified",
"@type":"http://www.w3.org/2001/XMLSchema#dateTime",
"minLength":1,
"type":"string",
"format": "date-time"
"format":"date-time"
},
"issued":{
"@id":"http://purl.org/dc/terms/issued",
"title":"Date Issued",
"description":"Date of formal issuance (e.g., publication, release date) of the catalogue.",
"@type":"http://www.w3.org/2001/XMLSchema#date",
"minLength":1,
"type":"string",
"format": "date"
"format":"date"
},
"language":{
"@id":"http://purl.org/dc/terms/language",
Expand Down Expand Up @@ -122,13 +126,15 @@
"title":"Schema name",
"description":"Name of the schema used by the catalog records",
"@type":"http://www.w3.org/2001/XMLSchema#string",
"minLength":1,
"type":"string"
},
"logo":{
"@id":"http://uri.suomi.fi/datamodel/ns/mdc#logo",
"title":"Logo",
"description":"Small symbol that represents the organization",
"@type":"http://www.w3.org/2001/XMLSchema#anyURI",
"minLength":1,
"type":"string",
"format":"uri"
},
Expand All @@ -155,12 +161,14 @@
"type":"object",
"@id":"http://www.w3.org/2004/02/skos/core#Concept",
"description":"An idea or notion; a unit of thought.",
"minProperties":1,
"properties":{
"identifier":{
"@id":"http://purl.org/dc/terms/identifier",
"title":"Identifier",
"description":"This is the IRI identifier for the concept",
"@type":"@id",
"minLength":1,
"type":"string",
"format":"uri"
},
Expand All @@ -183,12 +191,14 @@
"type":"object",
"@id":"http://xmlns.com/foaf/0.1/Document",
"description":"Documented link",
"minProperties":1,
"properties":{
"identifier":{
"@id":"http://purl.org/dc/terms/identifier",
"title":"URL",
"description":"URL of the homepage",
"@type":"http://www.w3.org/2001/XMLSchema#anyURI",
"minLength":1,
"type":"string",
"format":"uri"
},
Expand Down Expand Up @@ -220,6 +230,7 @@
"type":"object",
"@id":"http://purl.org/dc/terms/LinguisticSystem",
"description":"Examples include written, spoken, sign, and computer languages.\n\nA system of signs, symbols, sounds, gestures, or rules used in communication.",
"minProperties":1,
"properties":{
"title":{
"@id":"http://purl.org/dc/terms/title",
Expand All @@ -237,6 +248,7 @@
"title":"Identifier",
"description":"Language identifier. URI from http://publications.europa.eu/mdr/authority/language/",
"@type":"@id",
"minLength":1,
"type":"string",
"format":"uri"
}
Expand All @@ -251,17 +263,16 @@
"type":"object",
"@id":"http://xmlns.com/foaf/0.1/Organization",
"description":"Organization that distributes or publishes datasets",
"minProperties":1,
"properties":{
"identifier":{
"@id":"http://purl.org/dc/terms/identifier",
"title":"Identifier",
"description":"An unambiguous reference to the resource within a given context.",
"@type":"@id",
"minLength":1,
"type":"string",
"format":"uri",
"example":[
""
]
"format":"uri"
},
"name":{
"@id":"http://xmlns.com/foaf/0.1/name",
Expand All @@ -276,6 +287,7 @@
"title":"Email",
"description":"Email address.",
"@type":"http://www.w3.org/2001/XMLSchema#string",
"minLength":1,
"type":"string",
"format":"email"
},
Expand Down Expand Up @@ -318,12 +330,14 @@
"type":"object",
"@id":"http://purl.org/dc/terms/LicenseDocument",
"description":"A legal document giving official permission to do something with a Resource.",
"minProperties":1,
"properties":{
"identifier":{
"@id":"http://purl.org/dc/terms/identifier",
"title":"Identifier",
"description":"An unambiguous reference to the resource within a given context.",
"@type":"@id",
"minLength":1,
"type":"string",
"format":"uri"
},
Expand All @@ -348,6 +362,7 @@
"title":"Licence URL",
"description":"A referenced license document that applies to this content",
"@type":"http://www.w3.org/2001/XMLSchema#anyURI",
"minLength":1,
"type":"string",
"format":"uri"
}
Expand All @@ -362,6 +377,7 @@
"type":"object",
"@id":"http://purl.org/dc/terms/RightsStatement",
"description":"A statement about the intellectual property rights (IPR) held in or over a Resource, a legal document giving official permission to do something with a resource, or a statement about access rights.",
"minProperties":1,
"properties":{
"description":{
"@id":"http://purl.org/dc/terms/description",
Expand All @@ -376,8 +392,9 @@
"title":"Date Available",
"description":"Date (often a range) that the resource became or will become available.",
"@type":"http://www.w3.org/2001/XMLSchema#date",
"minLength":1,
"type":"string",
"format": "date"
"format":"date"
},
"access_type":{
"@id":"http://purl.org/dc/terms/type",
Expand Down Expand Up @@ -429,4 +446,4 @@
}
}
}
}
}
Loading

0 comments on commit 1cf1bd3

Please sign in to comment.