Skip to content

Commit

Permalink
updates to do things properly
Browse files Browse the repository at this point in the history
  • Loading branch information
@loki-sinclair-hdruk
loki-sinclair-hdruk committed Sep 23, 2024
1 parent 4b7894c commit 2d3ef64
Show file tree
Hide file tree
Showing 35 changed files with 215 additions and 169 deletions.
3 changes: 2 additions & 1 deletion docs/GWDM/1.0.form.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,8 @@
"is_optional": false,
"types": {
"title": "Url",
"pattern": "^\\s*((https?:\\/\\/)*([a-zA-Z0-9-]+\\.?)+[a-zA-Z]{2,}(:\\d+)?(\\/[^\\s]*)?(\\n)?)+$",
"format": "uri",
"minLength": 1,
"type": "string"
},
"location": "required.revisions.url"
Expand Down
6 changes: 3 additions & 3 deletions docs/GWDM/1.0.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,9 @@ Examples:

Some url with a reference to the record of a previous version of this dataset

| title | guidance | is_list | required | type |
|:-------------|:-----------|:----------|:-----------|:-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
| revision url | | False | True | ["Url[{'anyOf': [{'pattern': '^\\\\s*((https?:\\\\/\\\\/)*([a-zA-Z0-9-]+\\\\.?)+[a-zA-Z]{2,}(:\\\\d+)?(\\\\/[^\\\\s]*)?(\\<br>)?)+$', 'type': 'string'}, {'type': 'null'}]}]"] |
| title | guidance | is_list | required | type |
|:-------------|:-----------|:----------|:-----------|:--------------------------------------------------------------------------------------------|
| revision url | | False | True | ["Url[{'anyOf': [{'format': 'uri', 'minLength': 1, 'type': 'string'}, {'type': 'null'}]}]"] |

Examples:

Expand Down
2 changes: 1 addition & 1 deletion docs/GWDM/1.0.structure.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
"https://api.service.nhs.uk/health-research-data-catalogue/datasetrevisions/841f7da2-b018-41f6-b4ae-2e0aadab6561"
],
"type": [
"Url[{'anyOf': [{'pattern': '^\\\\s*((https?:\\\\/\\\\/)*([a-zA-Z0-9-]+\\\\.?)+[a-zA-Z]{2,}(:\\\\d+)?(\\\\/[^\\\\s]*)?(\\\\n)?)+$', 'type': 'string'}, {'type': 'null'}]}]"
"Url[{'anyOf': [{'format': 'uri', 'minLength': 1, 'type': 'string'}, {'type': 'null'}]}]"
],
"is_list": false,
"is_optional": false,
Expand Down
3 changes: 2 additions & 1 deletion docs/GWDM/1.1.form.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,8 @@
"is_optional": false,
"types": {
"title": "Url",
"pattern": "^\\s*((https?:\\/\\/)*([a-zA-Z0-9-]+\\.?)+[a-zA-Z]{2,}(:\\d+)?(\\/[^\\s]*)?(\\n)?)+$",
"format": "uri",
"minLength": 1,
"type": "string"
},
"location": "required.revisions.url"
Expand Down
6 changes: 3 additions & 3 deletions docs/GWDM/1.1.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,9 @@ Examples:

Some url with a reference to the record of a previous version of this dataset

| title | guidance | is_list | required | type |
|:-------------|:-----------|:----------|:-----------|:-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
| revision url | | False | True | ["Url[{'anyOf': [{'pattern': '^\\\\s*((https?:\\\\/\\\\/)*([a-zA-Z0-9-]+\\\\.?)+[a-zA-Z]{2,}(:\\\\d+)?(\\\\/[^\\\\s]*)?(\\<br>)?)+$', 'type': 'string'}, {'type': 'null'}]}]"] |
| title | guidance | is_list | required | type |
|:-------------|:-----------|:----------|:-----------|:--------------------------------------------------------------------------------------------|
| revision url | | False | True | ["Url[{'anyOf': [{'format': 'uri', 'minLength': 1, 'type': 'string'}, {'type': 'null'}]}]"] |

Examples:

Expand Down
2 changes: 1 addition & 1 deletion docs/GWDM/1.1.structure.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
"https://api.service.nhs.uk/health-research-data-catalogue/datasetrevisions/841f7da2-b018-41f6-b4ae-2e0aadab6561"
],
"type": [
"Url[{'anyOf': [{'pattern': '^\\\\s*((https?:\\\\/\\\\/)*([a-zA-Z0-9-]+\\\\.?)+[a-zA-Z]{2,}(:\\\\d+)?(\\\\/[^\\\\s]*)?(\\\\n)?)+$', 'type': 'string'}, {'type': 'null'}]}]"
"Url[{'anyOf': [{'format': 'uri', 'minLength': 1, 'type': 'string'}, {'type': 'null'}]}]"
],
"is_list": false,
"is_optional": false,
Expand Down
3 changes: 2 additions & 1 deletion docs/GWDM/1.2.form.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,8 @@
"is_optional": false,
"types": {
"title": "Url",
"pattern": "^\\s*((https?:\\/\\/)*([a-zA-Z0-9-]+\\.?)+[a-zA-Z]{2,}(:\\d+)?(\\/[^\\s]*)?(\\n)?)+$",
"format": "uri",
"minLength": 1,
"type": "string"
},
"location": "required.revisions.url"
Expand Down
6 changes: 3 additions & 3 deletions docs/GWDM/1.2.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,9 @@ Examples:

Some url with a reference to the record of a previous version of this dataset

| title | guidance | is_list | required | type |
|:-------------|:-----------|:----------|:-----------|:-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
| revision url | | False | True | ["Url[{'anyOf': [{'pattern': '^\\\\s*((https?:\\\\/\\\\/)*([a-zA-Z0-9-]+\\\\.?)+[a-zA-Z]{2,}(:\\\\d+)?(\\\\/[^\\\\s]*)?(\\<br>)?)+$', 'type': 'string'}, {'type': 'null'}]}]"] |
| title | guidance | is_list | required | type |
|:-------------|:-----------|:----------|:-----------|:--------------------------------------------------------------------------------------------|
| revision url | | False | True | ["Url[{'anyOf': [{'format': 'uri', 'minLength': 1, 'type': 'string'}, {'type': 'null'}]}]"] |

Examples:

Expand Down
2 changes: 1 addition & 1 deletion docs/GWDM/1.2.structure.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
"https://api.service.nhs.uk/health-research-data-catalogue/datasetrevisions/841f7da2-b018-41f6-b4ae-2e0aadab6561"
],
"type": [
"Url[{'anyOf': [{'pattern': '^\\\\s*((https?:\\\\/\\\\/)*([a-zA-Z0-9-]+\\\\.?)+[a-zA-Z]{2,}(:\\\\d+)?(\\\\/[^\\\\s]*)?(\\\\n)?)+$', 'type': 'string'}, {'type': 'null'}]}]"
"Url[{'anyOf': [{'format': 'uri', 'minLength': 1, 'type': 'string'}, {'type': 'null'}]}]"
],
"is_list": false,
"is_optional": false,
Expand Down
6 changes: 4 additions & 2 deletions docs/GWDM/2.0.form.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,8 @@
"is_optional": true,
"types": {
"title": "Url",
"pattern": "^\\s*((https?:\\/\\/)*([a-zA-Z0-9-]+\\.?)+[a-zA-Z]{2,}(:\\d+)?(\\/[^\\s]*)?(\\n)?)+$",
"format": "uri",
"minLength": 1,
"type": "string"
},
"location": "required.revisions.url"
Expand Down Expand Up @@ -399,7 +400,8 @@
"is_optional": true,
"types": {
"title": "Url",
"pattern": "^\\s*((https?:\\/\\/)*([a-zA-Z0-9-]+\\.?)+[a-zA-Z]{2,}(:\\d+)?(\\/[^\\s]*)?(\\n)?)+$",
"format": "uri",
"minLength": 1,
"type": "string"
},
"location": "coverage.datasetCompleteness"
Expand Down
12 changes: 6 additions & 6 deletions docs/GWDM/2.0.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,9 @@ Examples:

Some url with a reference to the record of a previous version of this dataset

| title | guidance | is_list | required | type |
|:-------------|:-----------|:----------|:-----------|:---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
| revision url | | False | True | ["Url[{'anyOf': [{'pattern': '^\\\\s*((https?:\\\\/\\\\/)*([a-zA-Z0-9-]+\\\\.?)+[a-zA-Z]{2,}(:\\\\d+)?(\\\\/[^\\\\s]*)?(\\<br>)?)+$', 'type': 'string'}, {'type': 'null'}]}]", 'null'] |
| title | guidance | is_list | required | type |
|:-------------|:-----------|:----------|:-----------|:----------------------------------------------------------------------------------------------------|
| revision url | | False | True | ["Url[{'anyOf': [{'format': 'uri', 'minLength': 1, 'type': 'string'}, {'type': 'null'}]}]", 'null'] |

Examples:

Expand Down Expand Up @@ -358,9 +358,9 @@ Examples:

The URL where a Researcher can learn more about the completeness of the dataset.

| title | guidance | is_list | required | type |
|:--------------------------------------|:-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|:----------|:-----------|:---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
| Dataset coverage/completeness/quality | If your organisation has a publicly available site which contains information on the completeness of a dataset, add that URL here.<br>**Example**: https://bhfdatasciencecentre.org/dashboard/ | False | False | ["Url[{'anyOf': [{'pattern': '^\\\\s*((https?:\\\\/\\\\/)*([a-zA-Z0-9-]+\\\\.?)+[a-zA-Z]{2,}(:\\\\d+)?(\\\\/[^\\\\s]*)?(\\<br>)?)+$', 'type': 'string'}, {'type': 'null'}]}]", 'null'] |
| title | guidance | is_list | required | type |
|:--------------------------------------|:-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|:----------|:-----------|:----------------------------------------------------------------------------------------------------|
| Dataset coverage/completeness/quality | If your organisation has a publicly available site which contains information on the completeness of a dataset, add that URL here.<br>**Example**: https://bhfdatasciencecentre.org/dashboard/ | False | False | ["Url[{'anyOf': [{'format': 'uri', 'minLength': 1, 'type': 'string'}, {'type': 'null'}]}]", 'null'] |

Examples:

Expand Down
4 changes: 2 additions & 2 deletions docs/GWDM/2.0.structure.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
"https://api.service.nhs.uk/health-research-data-catalogue/datasetrevisions/841f7da2-b018-41f6-b4ae-2e0aadab6561"
],
"type": [
"Url[{'anyOf': [{'pattern': '^\\\\s*((https?:\\\\/\\\\/)*([a-zA-Z0-9-]+\\\\.?)+[a-zA-Z]{2,}(:\\\\d+)?(\\\\/[^\\\\s]*)?(\\\\n)?)+$', 'type': 'string'}, {'type': 'null'}]}]",
"Url[{'anyOf': [{'format': 'uri', 'minLength': 1, 'type': 'string'}, {'type': 'null'}]}]",
"null"
],
"is_list": false,
Expand Down Expand Up @@ -478,7 +478,7 @@
"https://bhfdatasciencecentre.org/dashboard/"
],
"type": [
"Url[{'anyOf': [{'pattern': '^\\\\s*((https?:\\\\/\\\\/)*([a-zA-Z0-9-]+\\\\.?)+[a-zA-Z]{2,}(:\\\\d+)?(\\\\/[^\\\\s]*)?(\\\\n)?)+$', 'type': 'string'}, {'type': 'null'}]}]",
"Url[{'anyOf': [{'format': 'uri', 'minLength': 1, 'type': 'string'}, {'type': 'null'}]}]",
"null"
],
"is_list": false,
Expand Down
9 changes: 6 additions & 3 deletions docs/HDRUK/2.1.2.form.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,8 @@
"is_optional": true,
"types": {
"title": "Url",
"pattern": "^\\s*((https?:\\/\\/)*([a-zA-Z0-9-]+\\.?)+[a-zA-Z]{2,}(:\\d+)?(\\/[^\\s]*)?(\\n)?)+$",
"format": "uri",
"minLength": 1,
"type": "string"
},
"location": "revisions.url"
Expand Down Expand Up @@ -139,7 +140,8 @@
"is_optional": true,
"types": {
"title": "Url",
"pattern": "^\\s*((https?:\\/\\/)*([a-zA-Z0-9-]+\\.?)+[a-zA-Z]{2,}(:\\d+)?(\\/[^\\s]*)?(\\n)?)+$",
"format": "uri",
"minLength": 1,
"type": "string"
},
"location": "summary.publisher.identifier"
Expand Down Expand Up @@ -170,7 +172,8 @@
"is_optional": true,
"types": {
"title": "Url",
"pattern": "^\\s*((https?:\\/\\/)*([a-zA-Z0-9-]+\\.?)+[a-zA-Z]{2,}(:\\d+)?(\\/[^\\s]*)?(\\n)?)+$",
"format": "uri",
"minLength": 1,
"type": "string"
},
"location": "summary.publisher.logo"
Expand Down
Loading

0 comments on commit 2d3ef64

Please sign in to comment.