diff --git a/MANIFEST.in b/MANIFEST.in
index 10ee06a10..ac19dea33 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,5 +1,5 @@
include README.md
include knora/dsplib/utils/knora-schema.json
include knora/dsplib/utils/knora-schema-lists.json
-include knora/knora-data-schema.xsd
+include knora/dsplib/utils/knora-data-schema.xsd
include knora/icons/knora-py-logo.png
diff --git a/Makefile b/Makefile
index 027357acc..6fe3bb16b 100644
--- a/Makefile
+++ b/Makefile
@@ -71,4 +71,11 @@ clean: ## cleans the project directory
help: ## this help
@awk 'BEGIN {FS = ":.*?## "} /^[a-zA-Z_-]+:.*?## / {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}' $(MAKEFILE_LIST) | sort
+.PHONY: run
+run: ## create dist, inatall and run
+ $(MAKE) clean
+ $(MAKE) dist
+ $(MAKE) install
+ dsp-tools
+
.DEFAULT_GOAL := help
diff --git a/README.md b/README.md
index 41b65fab3..52b9a2626 100644
--- a/README.md
+++ b/README.md
@@ -53,7 +53,9 @@ $ make test
## Publishing to PyPi
-Generate distribution package. Make sure you have the latest versions of `setuptools` and `wheel` installed:
+Generate distribution package. Make sure you have the latest versions of `setuptools` and `wheel` installed.
+Remove the `dist`and `buil`-directories: `rm -rf bild dist`
+
```bash
$ make upgrade-dist-tools
diff --git a/docs/dsp-tools-create.md b/docs/dsp-tools-create.md
index aea7e8eca..857d04a1d 100644
--- a/docs/dsp-tools-create.md
+++ b/docs/dsp-tools-create.md
@@ -325,7 +325,11 @@ This object contains _user_-definitions. You can set user traits here. A user ha
- _familyName_: Surname of the user.
- _password_: Password of the user.
- _lang_: The preferred language of the user: "en", "de", "fr", "it" [optional, default: "en"].
-- _projects_: List of projects the user belongs to.
+- _projects_: List of projects the user belongs to. The project name has to be followed by a ":" and
+ either "member" or "admin". This indicates if the new user has admin rights in the given project or
+ is a oridnary user. This `myproject:admin` would add the user as admin to the project "myproject".
+ The given project defined in the same ontology file has no name, so only ":admin" or ":member" is
+ required. A user must be member of at least one project.
Example:
```json
diff --git a/docs/dsp-tools-xmlupload.md b/docs/dsp-tools-xmlupload.md
index eced2ad91..050c17b13 100644
--- a/docs/dsp-tools-xmlupload.md
+++ b/docs/dsp-tools-xmlupload.md
@@ -27,7 +27,7 @@ Thus, the ``-eelment may b used as follows:
xsi:schemaLocation="../knora-data-schema.xsd"
shortcode="0806"
ontology="webern">
-…
+ ...
```
The ``-element can only contain
@@ -112,7 +112,33 @@ _Options_:
- "SystemAdmin"
_Subelements allowed_: None
-
+
+Thus a complete _permission_ section may be as follows:
+```xml
+
+ RV
+ V
+ CR
+ CR
+
+
+ V
+ CR
+ CR
+
+
+ V
+ V
+ CR
+ CR
+
+
+ V
+ CR
+ CR
+
+```
+
### ``
A `resource`-element contains all necessary information to create a resource. It
has the following options:
@@ -127,14 +153,14 @@ _Options_:
- _permissions_: a reference to a permission set. These permissions will be applied to the newly created resoource.
[optional]
-````
+```xml
-…
+ ...
-````
+```
The ``-element contains for each property class a `property`-element which itself
contains one or several `value`-elements. It _must_ also contain an ``-element if the
@@ -148,6 +174,8 @@ _name_-option:
Example:
```xml
+ Dies ist eine Übersetzung
+
```
The ``-element may contain the following tags describing properties (data fields):
@@ -171,18 +199,60 @@ The ``-element may contain the following tags describing properties (d
#### ``-element
The ``-element contains the path to an image file. It must only be used if the
-resource is a `StillImageResource`!
+resource is a `StillImageRepresentation` and must be the first element!
_Options_:
- none
-_Note_: There is only _one_ ``-element allowed per StillImageResource!
+_Note_: There is only _one_ ``-element allowed per StillImageRepresentation!
Example:
```xml
postcards.dir/images/EURUS015a.jpg
```
+#### ``-element
+The ``-element contains the path to an sound file. It must only be used if the
+resource is a `AudioRepresentation` and must be the first element!
+
+_Options_:
+- none
+
+_Note_: There is only _one_ ``-element allowed per AudioRepresentation!
+
+Example:
+```xml
+concerts.dir/files/SOTW.wav
+```
+
+#### ``-element
+The ``-element contains the path to an movie file. It must only be used if the
+resource is a `MovingImageRepresentation` and must be the first element!
+
+_Options_:
+- none
+
+_Note_: There is only _one_ ``-element allowed per MovingImageRepresentation!
+
+Example:
+```xml
+movies.dir/files/the_general.mp4
+```
+
+#### ``-element
+The ``-element contains the path to an document file. It must only be used if the
+resource is a `DocumentRepresentation` and must be the first element!
+
+_Options_:
+- none
+
+_Note_: There is only _one_ ``-element allowed per DocumentRepresentation!
+
+Example:
+```xml
+facsimiles/files/we_the_people.pdf
+```
+
#### ``-element
The text property element is used to list text values.
@@ -196,42 +266,33 @@ _Options_:
The ``-element has the following options:
- _encoding_: either "utf8" or "hex64" [required]
- _utf8_: The element describes a simple text without markup. The text is a simple utf-8 string
- - _hex64_: The elemen describes a complex text containing markup. It must be a hex64 encoded string in the
- XML-format as defined by Knora.
-- _resrefs_: A list of resource ID's that are referenced in the markup, separated by the "|"-character such as `"2569981|6618"` [optional]
+ - _xml_: The element describes a complex text containing markup. It must be follow the XML-format as defined by the
+ [DSP standard mapping](https://docs.knora.org/03-apis/api-v1/xml-to-standoff-mapping/) .
- _permissions_: ID or a permission set. Optional, but if omitted very restricted default permissions apply!
- _comment_: A comment to this specific value.
+###### Simple Text
+A complete example for a simple text:
+```xml
+
+ Probe bei "Wimberger". Lokal in Wien?
+
+```
+
+###### Text with Markup
Knora-xml-import assumes that for markup-text (standoff-markup) standard mapping for Knora is being used (Custom mapping to
customized standoff tags is not yet implemented!)
-E.g. a text containing a link to another resource must have the following form before being
-encoded as hex64-string:
+E.g. a text containing a link to another resource must have the following form:
```xml
-'Brief:
'
+The third object and a link to.
```
-Please note that the href-option withiin the anchor tag points to an internal resource of knora
+Please note that the href-option within the anchor tag points to an internal resource of knora
and this has to have the special format "`IRI:`res-id`:IRI`" where res-id is the resource
id defined within the XML import file. A resource already existing in knora can be referenced by
indicating its IRI directly has _href_-option.
-In case the string references one or more internal resources, the option `resrefs`_must_ be using to
-indicate there ID's! The ID's are separated by a "|"-character
-
-A complete example for a simple text:
-```xml
-
- Probe bei "Wimberger". Lokal in Wien?
-
-```
-A complete example of a complex text which encodes the text `