Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: bugs in json schema (DEV-1142) #252

Merged
merged 11 commits into from Nov 11, 2022
Merged

fix: bugs in json schema (DEV-1142) #252

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
4d04094
semantically meaningless refactorings
jnussbaum Nov 9, 2022
8ba25dd
- resources-only.json: add "Region" and "Representation" as base res…
jnussbaum Nov 9, 2022
e5bb1c6
harmonization between all 3 files
jnussbaum Nov 10, 2022
e7d1d35
improve: "format": "uri" has no effect --> needs a regex
jnussbaum Nov 10, 2022
246d994
expand test data:
jnussbaum Nov 10, 2022
2a54bf8
- harmonize lists-only.json and ontology.json
jnussbaum Nov 10, 2022
9edb10a
remove redundancy of definitions/label, definitions/comment, definiti…
jnussbaum Nov 10, 2022
f254e37
fix unittest
jnussbaum Nov 10, 2022
99926ec
langstring: make at least one language mandatory
jnussbaum Nov 10, 2022
fb362e3
take URI into account in the conditions for the super-properties
jnussbaum Nov 10, 2022
d0c1066
fix test data
jnussbaum Nov 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
66 changes: 9 additions & 57 deletions knora/dsplib/schemas/lists-only.json
View file
Open in desktop
Expand Up @@ -11,18 +11,7 @@
"type": "string"
}
},
"additionalProperties": false
},
"label": {
"$ref": "#/definitions/langstring"
},
"comment": {
"type": "object",
"patternProperties": {
"^(en|de|fr|it|rm)$": {
"type": "string"
}
},
"minProperties": 1,
"additionalProperties": false
},
"node": {
Expand All @@ -32,29 +21,17 @@
"type": "string"
},
"labels": {
"$ref": "#/definitions/label"
"$ref": "#/definitions/langstring"
},
"comments": {
"$ref": "#/definitions/comment"
"$ref": "#/definitions/langstring"
},
"nodes": {
"type": "array",
"minItems": 1,
"oneOf": [
{
"type": "array",
"items": {
"$ref": "#/definitions/node"
}
},
{
"type": "object",
"$ref": "#/definitions/excelfileref"
},
{
"type": "object",
"$ref": "#/definitions/excelfolderref"
}
]
"items": {
"$ref": "#/definitions/node"
}
}
},
"required": [
Expand All @@ -63,27 +40,6 @@
],
"additionalProperties": false
},
"excelfileref": {
"type": "object",
"properties": {
"file": {
"type": "string"
},
"worksheet": {
"type": "string"
},
"startrow": {
"type": "integer"
},
"startcol": {
"type": "integer"
}
},
"required": [
"file",
"worksheet"
]
},
"excelfolderref": {
"type": "object",
"properties": {
Expand All @@ -107,10 +63,10 @@
"type": "string"
},
"labels": {
"$ref": "#/definitions/label"
"$ref": "#/definitions/langstring"
},
"comments": {
"$ref": "#/definitions/comment"
"$ref": "#/definitions/langstring"
},
"nodes": {
"oneOf": [
Expand All @@ -120,10 +76,6 @@
"$ref": "#/definitions/node"
}
},
{
"type": "object",
"$ref": "#/definitions/excelfileref"
},
{
"type": "object",
"$ref": "#/definitions/excelfolderref"
Expand Down