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(schema-documentation): update schemas and documentation (DEV-61) #105

Merged
merged 22 commits into from Oct 12, 2021
Merged

fix(schema-documentation): update schemas and documentation (DEV-61) #105

Show file tree
Hide file tree
Changes from 15 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
d3da1b5
update schemas
Oct 4, 2021
8503674
update documentation
Oct 4, 2021
d3b832d
reformat docs
Oct 4, 2021
f68edfe
update ontology.json to allow folder as Excel reference
Oct 4, 2021
78b9232
allow folder reference in list ontologies
Oct 4, 2021
f2ee657
fix failing test
Oct 4, 2021
f9c93c7
fix failing test
Oct 4, 2021
55f53c0
get local schema for tests
Oct 4, 2021
eac5151
Update Resources.xlsx
Oct 4, 2021
b5c97aa
Remove Pulldown for listValues in documentation
Oct 5, 2021
c25d22f
remove pulldown from list of gui elements
Oct 5, 2021
b5a1b3a
Update BUILD.bazel
Oct 5, 2021
419ddf2
Update dsp-tools-create.md
Oct 5, 2021
ef0e4ef
Update dsp-tools-create.md
Oct 5, 2021
edd27f5
Merge branch 'wip/dev-61-fix-documentation' of https://github.com/das…
Oct 5, 2021
caa0369
adapt groups to new data model
Oct 12, 2021
91a6911
update group and project tests
Oct 12, 2021
ae6ce46
update longname when changed
Oct 12, 2021
51d3b47
introduce prefixed names in schemas
Oct 12, 2021
e024e0e
Update test_user.py
Oct 12, 2021
d9a9033
Update dsp-tools-create.md
Oct 12, 2021
d6b98f7
Update GitHub actions
Oct 12, 2021
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
449 changes: 168 additions & 281 deletions docs/dsp-tools-create.md
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions knora/dsplib/schemas/data.xsd
View file
Open in desktop
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<xs:schema xmlns="https://dasch.swiss/schema"
xmlns:xs="http://www.w3.org/2001/XMLSchema"
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns="https://dasch.swiss/schema"
targetNamespace="https://dasch.swiss/schema"
elementFormDefault="qualified">

Expand Down
72 changes: 64 additions & 8 deletions knora/dsplib/schemas/lists-only.json
View file
Open in desktop
Expand Up @@ -35,17 +35,61 @@
"$ref": "#/definitions/comment"
},
"nodes": {
"type": "array",
"items": {
"$ref": "#/definitions/node"
}
"oneOf": [
{
"type": "array",
"items": {
"$ref": "#/definitions/node"
}
},
{
"type": "object",
"$ref": "#/definitions/excelfileref"
},
{
"type": "object",
"$ref": "#/definitions/excelfolderref"
}
]
}
},
"required": [
"name",
"labels"
],
"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": {
"folder": {
"type": "string"
}
},
"required": [
"folder"
]
}
},
"type": "object",
Expand All @@ -60,10 +104,22 @@
"$ref": "#/definitions/comment"
},
"nodes": {
"type": "array",
"items": {
"$ref": "#/definitions/node"
}
"oneOf": [
{
"type": "array",
"items": {
"$ref": "#/definitions/node"
}
},
{
"type": "object",
"$ref": "#/definitions/excelfileref"
},
{
"type": "object",
"$ref": "#/definitions/excelfolderref"
}
]
}
},
"required": [
Expand Down
59 changes: 47 additions & 12 deletions knora/dsplib/schemas/lists.json
View file
Open in desktop
Expand Up @@ -4,7 +4,7 @@
"title": "JSON schema for DSP lists",
"description": "JSON schema for lists used in DSP ontologies",
"definitions": {
"label": {
"langstring": {
"type": "object",
"patternProperties": {
"^(en|de|fr|it)": {
Expand All @@ -13,23 +13,46 @@
},
"additionalProperties": false
},
"label": {
"$ref": "#/definitions/langstring"
},
"description": {
"$ref": "#/definitions/langstring"
},
"comment": {
"$ref": "#/definitions/langstring"
},
"excelfileref": {
"type": "object",
"patternProperties": {
"^(en|de|fr|it)": {
"properties": {
"file": {
"type": "string"
},
"worksheet": {
"type": "string"
},
"startrow": {
"type": "integer"
},
"startcol": {
"type": "integer"
}
},
"additionalProperties": false
"required": [
"file",
"worksheet"
]
},
"comment": {
"excelfolderref": {
"type": "object",
"patternProperties": {
"^(en|de|fr|it)": {
"properties": {
"folder": {
"type": "string"
}
},
"additionalProperties": false
"required": [
"folder"
]
},
"node": {
"type": "object",
Expand All @@ -44,10 +67,22 @@
"$ref": "#/definitions/comment"
},
"nodes": {
"type": "array",
"items": {
"$ref": "#/definitions/node"
}
"oneOf": [
{
"type": "array",
"items": {
"$ref": "#/definitions/node"
}
},
{
"type": "object",
"$ref": "#/definitions/excelfileref"
},
{
"type": "object",
"$ref": "#/definitions/excelfolderref"
}
]
}
},
"required": [
Expand Down