From 2fe5d4ce66043da2a26237f2a861f6d3b6cc67ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mich=C3=A8le=20Spichtig?= Date: Wed, 25 Oct 2023 16:09:56 +0200 Subject: [PATCH 01/14] changes property licence and rights --- .../dcat-definitions/distribution-license.rst | 37 +++++++++++++++++-- .../dcat-definitions/distribution-rights.rst | 18 ++++----- 2 files changed, 42 insertions(+), 13 deletions(-) diff --git a/source/content/glossar/bibliothek/dcat-definitions/distribution-license.rst b/source/content/glossar/bibliothek/dcat-definitions/distribution-license.rst index 900c1062..07019fa9 100644 --- a/source/content/glossar/bibliothek/dcat-definitions/distribution-license.rst +++ b/source/content/glossar/bibliothek/dcat-definitions/distribution-license.rst @@ -2,6 +2,37 @@ :Domain: dcat:Distribution :Value: ``dct:LicenseDocument`` :Requirement Level: optional -:Cardinality: 0..1 -:Description: Rights statement of this distribution. It relates to the ``dcat:accessURL`` -:Usage Notes: Not used, see ``dct:rights``. This field ensures compatibility to other metadata standards. +:Cardinality: 1..1 +:Description: The `rights statement / terms of use `__ indicates for what purpose and in what context + the data of a distribution can be used: for commercial or for non commercial purposes. + Does it need to be referenced, when it is used? Must permission be obtained for commercial use. + These conditions are included in the rights statements. See the list below for the exact values. + +:Usage Notes: Terms of use are no longer referenced under ``dct:rights``, but under ``dct:license``. + + Exception: If other licenses, such as CC-licenses, are used for the dataset besides the terms of use, the + terms of use are referenced under dct:rights. Only the terms of use are displayed on opendata.swiss. If other + licenses are included, they are passed on to the portal data.europa.eu. + + This field ensures compatibility to other metadata standards such as DCAT-AP. + +.. code-block:: + :caption: Values **acceptable** for opendata.swiss + :emphasize-lines: 1,2,3,4 + + NonCommercialAllowed-CommercialAllowed-ReferenceNotRequired + NonCommercialAllowed-CommercialAllowed-ReferenceRequired + NonCommercialAllowed-CommercialWithPermission-ReferenceNotRequired + NonCommercialAllowed-CommercialWithPermission-ReferenceRequired + +.. code-block:: + :caption: Values **not acceptable** for opendata.swiss + + NonCommercialAllowed-CommercialNotAllowed-ReferenceNotRequired + NonCommercialAllowed-CommercialNotAllowed-ReferenceRequired + NonCommercialNotAllowed-CommercialNotAllowed-ReferenceNotRequired + NonCommercialNotAllowed-CommercialNotAllowed-ReferenceRequired + NonCommercialNotAllowed-CommercialAllowed-ReferenceNotRequired + NonCommercialNotAllowed-CommercialAllowed-ReferenceRequired + NonCommercialNotAllowed-CommercialWithPermission-ReferenceNotRequired + NonCommercialNotAllowed-CommercialWithPermission-ReferenceRequired diff --git a/source/content/glossar/bibliothek/dcat-definitions/distribution-rights.rst b/source/content/glossar/bibliothek/dcat-definitions/distribution-rights.rst index bde3914b..28c8cfdb 100644 --- a/source/content/glossar/bibliothek/dcat-definitions/distribution-rights.rst +++ b/source/content/glossar/bibliothek/dcat-definitions/distribution-rights.rst @@ -1,17 +1,15 @@ :DCAT URI: dct:rights :Domain: dcat:Distribution :Value: ``rdfs:Literal`` http://www.w3.org/TR/rdf-schema/#ch_literal -:Requirement Level: mandatory -:Cardinality: 1..1 -:Description: Rights statement that is relevant for the dcat:accessURL of this distribution. -:Usage Notes: The `rights statement / terms of use `__ declares for which purpose and in which context - the data of a distribution can be used: for commercial purposes or only for - non commercial purposes. Does it need to be referenced, when it is used? These - conditions are all captured in the right statements. For the exact values, - see the list below. +:Requirement Level: Recommended +:Description: This property refers to a statement that specifies rights associated with the Distribution. Only used in exceptional cases (see usage notes below). +:Usage notes: Imporant: The property `dct:license `__ with the values accepted for opendata.swiss is now + requiered for the `terms of use `__. + Exception: If someone uses datasets with CC-licenses in their catalogue, these can be kept under + dct:license, but in this case the terms of use must be entered under dct:rights. .. code-block:: - :caption: Values acceptable for opendata.swiss + :caption: Values **acceptable** for opendata.swiss :emphasize-lines: 1,2,3,4 NonCommercialAllowed-CommercialAllowed-ReferenceNotRequired @@ -20,7 +18,7 @@ NonCommercialAllowed-CommercialWithPermission-ReferenceRequired .. code-block:: - :caption: Values not acceptable for opendata.swiss + :caption: Values **not acceptable** for opendata.swiss NonCommercialAllowed-CommercialNotAllowed-ReferenceNotRequired NonCommercialAllowed-CommercialNotAllowed-ReferenceRequired From 35a0f2275037a274fd7c469dde73eaa750559882 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mich=C3=A8le=20Spichtig?= Date: Thu, 26 Oct 2023 18:16:45 +0200 Subject: [PATCH 02/14] adjust the format --- .../dcat-definitions/distribution-format.rst | 15 ++++++++++----- .../dcat-examples/distribution-format-rdf.rst | 6 +++--- .../dcat-examples/distribution-format-ttl.rst | 6 +++--- 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/source/content/glossar/bibliothek/dcat-definitions/distribution-format.rst b/source/content/glossar/bibliothek/dcat-definitions/distribution-format.rst index e0278050..dbb9bf70 100644 --- a/source/content/glossar/bibliothek/dcat-definitions/distribution-format.rst +++ b/source/content/glossar/bibliothek/dcat-definitions/distribution-format.rst @@ -1,8 +1,13 @@ :DCAT URI: dct:format :Domain: dcat:Distribution -:Value: ``dct:MediaTypeOrExtent`` http://www.iana.org/assignments/media-types/media-types.xhtml -:Requirement Level: conditional, required if the distribution is accessible by a ``dcat:downloadURL`` +:Value: `dct:MediaTypeOrExtent `__ +:Requirement Level: Recommended, required if the distribution is accessible by a ``dcat:downloadURL`` :Cardinality: 0..1 -:Description: Format of the distribution -:Usage Notes: If neither the ``downloadURL`` nor the ``mediaType`` provide a - valid format, this value is used to display the format of the distribution. +:Description: This property refers to the file format of the distribution +:Usage Notes: CV to be used: [`VOCAB-EU-FILE-TYPE `__] + + If a format is not available: + + #. media type [`IANA-MEDIA-TYPES `__] should be used + + #. if required, please contact `Geschäftsstelle OGD `__. diff --git a/source/content/glossar/bibliothek/dcat-examples/distribution-format-rdf.rst b/source/content/glossar/bibliothek/dcat-examples/distribution-format-rdf.rst index 7a3d496f..4c8ae43d 100644 --- a/source/content/glossar/bibliothek/dcat-examples/distribution-format-rdf.rst +++ b/source/content/glossar/bibliothek/dcat-examples/distribution-format-rdf.rst @@ -7,9 +7,9 @@ xmlns:dcat="http://www.w3.org/ns/dcat#" xmlns:dc="http://purl.org/dc/terms/"> - - - + + + diff --git a/source/content/glossar/bibliothek/dcat-examples/distribution-format-ttl.rst b/source/content/glossar/bibliothek/dcat-examples/distribution-format-ttl.rst index 0754ef45..b8a01c14 100644 --- a/source/content/glossar/bibliothek/dcat-examples/distribution-format-ttl.rst +++ b/source/content/glossar/bibliothek/dcat-examples/distribution-format-ttl.rst @@ -6,7 +6,7 @@ @prefix dct: . @prefix xsd: . - + a dcat:Distribution ; - dcat:accessURL ; - dct:format . + dcat:accessURL ; + dct:format . From 151050805d3db086d8a07e638b654dc810cc8a6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mich=C3=A8le=20Spichtig?= Date: Thu, 26 Oct 2023 19:40:06 +0200 Subject: [PATCH 03/14] changes property documentation and seeAls --- .../content/glossar/bibliothek/dcat-ap-ch.rst | 19 +++++++++++++++++++ .../dataset-documentation.rst | 7 +++++++ .../dcat-definitions/dataset-see-also.rst | 13 ++++++++----- 3 files changed, 34 insertions(+), 5 deletions(-) create mode 100644 source/content/glossar/bibliothek/dcat-definitions/dataset-documentation.rst diff --git a/source/content/glossar/bibliothek/dcat-ap-ch.rst b/source/content/glossar/bibliothek/dcat-ap-ch.rst index 97e1a9ff..8cd75555 100644 --- a/source/content/glossar/bibliothek/dcat-ap-ch.rst +++ b/source/content/glossar/bibliothek/dcat-ap-ch.rst @@ -645,6 +645,25 @@ dct:relation (DCAT) .. include:: dcat-examples/dataset-relation-rdf.rst +.. _dcat-dataset-documenation: + +dct:documentation (DCAT) +^^^^^^^^^^^^^^^^^^^^^^^^ + +.. container:: Mapping + + .. include:: dcat-definitions/dataset-documentation.rst + +.. toggle-header:: + :header: Property ``dct:documentation`` of ``dcat:Dataset`` in Turtle + + .. include:: dcat-examples/dataset-relation-ttl.rst + +.. toggle-header:: + :header: Property ``dct:relation`` of ``dcat:Dataset`` in Rdf/xml + + .. include:: dcat-examples/dataset-relation-rdf.rst + .. _dcat-dataset-keyword: dcat:keyword (DCAT) diff --git a/source/content/glossar/bibliothek/dcat-definitions/dataset-documentation.rst b/source/content/glossar/bibliothek/dcat-definitions/dataset-documentation.rst new file mode 100644 index 00000000..cd85f963 --- /dev/null +++ b/source/content/glossar/bibliothek/dcat-definitions/dataset-documentation.rst @@ -0,0 +1,7 @@ +:DCAT URI: foaf:page +:Domain: dcat:Dataset +:Value: ``foaf:Document`` +:Requirement Level: Optional +:Cardinality: 0..n +:Description: documentation +:Usage Notes: This property refers to a page or document about this Dataset diff --git a/source/content/glossar/bibliothek/dcat-definitions/dataset-see-also.rst b/source/content/glossar/bibliothek/dcat-definitions/dataset-see-also.rst index 99530c9b..95cba734 100644 --- a/source/content/glossar/bibliothek/dcat-definitions/dataset-see-also.rst +++ b/source/content/glossar/bibliothek/dcat-definitions/dataset-see-also.rst @@ -1,7 +1,10 @@ -:DCAT URI: rdfs:seeAlso +:DCAT URI: dcat:qualifiedRelation :Domain: dcat:Dataset -:Value: ``rdfs:Resource`` -:Requirement Level: optional +:Value: `rdfs:Resource `__ +:Requirement Level: Optional :Cardinality: 0..n -:Description: Link to related datasets. -:Usage Notes: Contains the identifier of the linked dataset. +:Description: Link to related datasets on opendata.swiss. +:Usage Notes: Contains the identifier of the linked dataset. You have to used + the perma link for this: + + ``https://ogdch-abnahme.clients.liip.ch/perma/adb280a9-381d-4fb3-ae43-b40ace826dc7@stadt-zurich"`` From 1f024170d1645a75e765820b2c4ef4c8c1b0e071 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mich=C3=A8le=20Spichtig?= Date: Fri, 27 Oct 2023 17:14:00 +0200 Subject: [PATCH 04/14] add qualified relation and deprecate seealso --- .../content/glossar/bibliothek/dcat-ap-ch.rst | 30 ++++++++++++------- ...lso.rst => dataset-qualified-relation.rst} | 0 .../dataset-see-also copy.rst | 10 +++++++ .../dataset-qualified-relation-rdf.rst | 17 +++++++++++ .../dataset-qualified-relation-ttl.rst | 13 ++++++++ .../{ => deprecated}/dataset-see-also-rdf.rst | 0 .../{ => deprecated}/dataset-see-also-ttl.rst | 0 7 files changed, 60 insertions(+), 10 deletions(-) rename source/content/glossar/bibliothek/dcat-definitions/{dataset-see-also.rst => dataset-qualified-relation.rst} (100%) create mode 100644 source/content/glossar/bibliothek/dcat-definitions/dataset-see-also copy.rst create mode 100644 source/content/glossar/bibliothek/dcat-examples/dataset-qualified-relation-rdf.rst create mode 100644 source/content/glossar/bibliothek/dcat-examples/dataset-qualified-relation-ttl.rst rename source/content/glossar/bibliothek/dcat-examples/{ => deprecated}/dataset-see-also-rdf.rst (100%) rename source/content/glossar/bibliothek/dcat-examples/{ => deprecated}/dataset-see-also-ttl.rst (100%) diff --git a/source/content/glossar/bibliothek/dcat-ap-ch.rst b/source/content/glossar/bibliothek/dcat-ap-ch.rst index 8cd75555..99d76086 100644 --- a/source/content/glossar/bibliothek/dcat-ap-ch.rst +++ b/source/content/glossar/bibliothek/dcat-ap-ch.rst @@ -273,9 +273,9 @@ Translatable elements are marked as such under usage notes. * - :ref:`related resource ` - dct:relation - optional - * - :ref:`see also ` - - rdfs:seeAlso - - optional + * - :fa:`exclamation`:ref:`qualifiedRelation ` + - dcat:qualifiedRelation + - optional :fa:`exclamation` replaces the property rdfs:seeAlso .. list-table:: Properties of dcat:Distribution @@ -769,24 +769,34 @@ dct:accrual-periodicity (DCAT) .. include:: dcat-examples/deprecated/dataset-accrual-periodicity-rdf.rst -.. _dcat-dataset-see-also: +.. _dcat-dataset-qualified-relation: -dcat:seeAlso (DCAT) +dcat:qualifiedRelation (DCAT) ^^^^^^^^^^^^^^^^^^^^^^^^ .. container:: Mapping - .. include:: dcat-definitions/dataset-see-also.rst + .. include:: dcat-definitions/dataset-qualified-relation.rst + +.. toggle-header:: + :header: :fa:`exclamation` Property ``dcat:qualifiedRelation`` of ``dcat:Dataset`` in Turtle + + .. include:: dcat-examples/dataset-qualified-relation-ttl.rst + +.. toggle-header:: + :header: :fa:`exclamation` Property ``dcat:qualifiedRelation`` of ``dcat:Dataset`` in Rdf/xml + + .. include:: dcat-examples/dataset-qualified-relation-rdf.rst .. toggle-header:: - :header: Property ``rdfs:seeAlso`` of ``dcat:Dataset`` in Turtle + :header: Deprecated: Property ``rdfs:seeAlso`` of ``dcat:Dataset`` in Turtle - .. include:: dcat-examples/dataset-see-also-ttl.rst + .. include:: dcat-examples//deprecated/dataset-see-also-ttl.rst .. toggle-header:: - :header: Property ``rdfs:seeAlso`` of ``dcat:Dataset`` in Rdf/xml + :header: Deprecated: Property ``rdfs:seeAlso`` of ``dcat:Dataset`` in Rdf/xml - .. include:: dcat-examples/dataset-see-also-rdf.rst + .. include:: dcat-examples//deprecated/dataset-see-also-rdf.rst .. _dcat-ap-ch-distribution: diff --git a/source/content/glossar/bibliothek/dcat-definitions/dataset-see-also.rst b/source/content/glossar/bibliothek/dcat-definitions/dataset-qualified-relation.rst similarity index 100% rename from source/content/glossar/bibliothek/dcat-definitions/dataset-see-also.rst rename to source/content/glossar/bibliothek/dcat-definitions/dataset-qualified-relation.rst diff --git a/source/content/glossar/bibliothek/dcat-definitions/dataset-see-also copy.rst b/source/content/glossar/bibliothek/dcat-definitions/dataset-see-also copy.rst new file mode 100644 index 00000000..95cba734 --- /dev/null +++ b/source/content/glossar/bibliothek/dcat-definitions/dataset-see-also copy.rst @@ -0,0 +1,10 @@ +:DCAT URI: dcat:qualifiedRelation +:Domain: dcat:Dataset +:Value: `rdfs:Resource `__ +:Requirement Level: Optional +:Cardinality: 0..n +:Description: Link to related datasets on opendata.swiss. +:Usage Notes: Contains the identifier of the linked dataset. You have to used + the perma link for this: + + ``https://ogdch-abnahme.clients.liip.ch/perma/adb280a9-381d-4fb3-ae43-b40ace826dc7@stadt-zurich"`` diff --git a/source/content/glossar/bibliothek/dcat-examples/dataset-qualified-relation-rdf.rst b/source/content/glossar/bibliothek/dcat-examples/dataset-qualified-relation-rdf.rst new file mode 100644 index 00000000..8fcd6b3b --- /dev/null +++ b/source/content/glossar/bibliothek/dcat-examples/dataset-qualified-relation-rdf.rst @@ -0,0 +1,17 @@ +.. code-block:: xml + :caption: A ``dcat:Dataset`` with a ``dcat:qualifiedRelation`` in RDF + :emphasize-lines: 7,8,9,10,11 + + + + + + + + + + + + diff --git a/source/content/glossar/bibliothek/dcat-examples/dataset-qualified-relation-ttl.rst b/source/content/glossar/bibliothek/dcat-examples/dataset-qualified-relation-ttl.rst new file mode 100644 index 00000000..4b8b7fa2 --- /dev/null +++ b/source/content/glossar/bibliothek/dcat-examples/dataset-qualified-relation-ttl.rst @@ -0,0 +1,13 @@ +.. code-block:: Turtle + :caption: A ``dcat:Dataset`` with a ``rdfs:seeAlso`` in Turtle + :emphasize-lines: 6,7,8 + + @prefix rdf: . + @prefix dcat: . + @prefix dcterms: . + + a dcat:Dataset ; + dcat:qualifiedRelation [ + rdf:type dcat:Relationship ; + dcterms:relation ; + ] . diff --git a/source/content/glossar/bibliothek/dcat-examples/dataset-see-also-rdf.rst b/source/content/glossar/bibliothek/dcat-examples/deprecated/dataset-see-also-rdf.rst similarity index 100% rename from source/content/glossar/bibliothek/dcat-examples/dataset-see-also-rdf.rst rename to source/content/glossar/bibliothek/dcat-examples/deprecated/dataset-see-also-rdf.rst diff --git a/source/content/glossar/bibliothek/dcat-examples/dataset-see-also-ttl.rst b/source/content/glossar/bibliothek/dcat-examples/deprecated/dataset-see-also-ttl.rst similarity index 100% rename from source/content/glossar/bibliothek/dcat-examples/dataset-see-also-ttl.rst rename to source/content/glossar/bibliothek/dcat-examples/deprecated/dataset-see-also-ttl.rst From 2b4f335ab79104b3354b4c381438b2dbc6ec7678 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mich=C3=A8le=20Spichtig?= Date: Mon, 30 Oct 2023 07:58:02 +0100 Subject: [PATCH 05/14] licence adjust text --- .../bibliothek/dcat-definitions/distribution-license.rst | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/source/content/glossar/bibliothek/dcat-definitions/distribution-license.rst b/source/content/glossar/bibliothek/dcat-definitions/distribution-license.rst index 07019fa9..545cd045 100644 --- a/source/content/glossar/bibliothek/dcat-definitions/distribution-license.rst +++ b/source/content/glossar/bibliothek/dcat-definitions/distribution-license.rst @@ -1,7 +1,7 @@ -:DCAT URI: dct:license +:DCAT URI: `dct:license `__ :Domain: dcat:Distribution -:Value: ``dct:LicenseDocument`` -:Requirement Level: optional +:Value: `dct:LicenseDocument `__ +:Requirement Level: Mandatory :Cardinality: 1..1 :Description: The `rights statement / terms of use `__ indicates for what purpose and in what context the data of a distribution can be used: for commercial or for non commercial purposes. @@ -14,6 +14,8 @@ terms of use are referenced under dct:rights. Only the terms of use are displayed on opendata.swiss. If other licenses are included, they are passed on to the portal data.europa.eu. + CV to be used: `DCAT-AP CH license vocabulary `__ + This field ensures compatibility to other metadata standards such as DCAT-AP. .. code-block:: From df92f4a4a8482040c83d51e6783f1c942c8cbb2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mich=C3=A8le=20Spichtig?= Date: Mon, 30 Oct 2023 08:53:29 +0100 Subject: [PATCH 06/14] license and qualified relation changes --- .../content/glossar/bibliothek/dcat-ap-ch.rst | 22 ++++++++++++++----- .../dataset-qualified-relation.rst | 5 ++--- .../distribution-license-rdf.rst | 17 ++++++++++++++ .../distribution-license-ttl.rst | 16 ++++++++++++++ 4 files changed, 51 insertions(+), 9 deletions(-) create mode 100644 source/content/glossar/bibliothek/dcat-examples/distribution-license-rdf.rst create mode 100644 source/content/glossar/bibliothek/dcat-examples/distribution-license-ttl.rst diff --git a/source/content/glossar/bibliothek/dcat-ap-ch.rst b/source/content/glossar/bibliothek/dcat-ap-ch.rst index 99d76086..6cd52df9 100644 --- a/source/content/glossar/bibliothek/dcat-ap-ch.rst +++ b/source/content/glossar/bibliothek/dcat-ap-ch.rst @@ -292,9 +292,9 @@ Translatable elements are marked as such under usage notes. * - :ref:`access url ` - dcat:accessURL - **mandatory** - * - :ref:`rights ` - - dct:rights - - **mandatory** + * - :fa:`exclamation` :ref:`license ` + - dcat:license + - **mandatory**, replaces dct:rights * - :ref:`title ` - dct:title - conditional, multilingual @@ -310,15 +310,15 @@ Translatable elements are marked as such under usage notes. * - :ref:`format ` - dct:format - conditional + * - :fa:`exclamation` :ref:`rights ` + - dct:rights + - optional, for exceptional use only * - :ref:`language ` - dct:language - conditional * - :ref:`modified ` - dct:modified - conditional - * - :ref:`license ` - - dcat:license - - optional * - :ref:`identifier ` - dct:identifier - optional @@ -1078,3 +1078,13 @@ dct:license (DCAT) .. container:: Mapping .. include:: dcat-definitions/distribution-license.rst + +.. toggle-header:: + :header: Property ``dct:license`` of ``dcat:Distribution`` in Turtle + + .. include:: dcat-examples/distribution-license-ttl.rst + +.. toggle-header:: + :header: Property ``dct:license`` of ``dcat:Distribution`` in Rdf/xml + + .. include:: dcat-examples/distribution-license-rdf.rst diff --git a/source/content/glossar/bibliothek/dcat-definitions/dataset-qualified-relation.rst b/source/content/glossar/bibliothek/dcat-definitions/dataset-qualified-relation.rst index 95cba734..05d07aae 100644 --- a/source/content/glossar/bibliothek/dcat-definitions/dataset-qualified-relation.rst +++ b/source/content/glossar/bibliothek/dcat-definitions/dataset-qualified-relation.rst @@ -1,10 +1,9 @@ -:DCAT URI: dcat:qualifiedRelation +:DCAT URI: `dcat:qualifiedRelation `__ :Domain: dcat:Dataset :Value: `rdfs:Resource `__ :Requirement Level: Optional :Cardinality: 0..n :Description: Link to related datasets on opendata.swiss. -:Usage Notes: Contains the identifier of the linked dataset. You have to used - the perma link for this: +:Usage Notes: Contains the identifier of the related dataset. The perma link must be used: ``https://ogdch-abnahme.clients.liip.ch/perma/adb280a9-381d-4fb3-ae43-b40ace826dc7@stadt-zurich"`` diff --git a/source/content/glossar/bibliothek/dcat-examples/distribution-license-rdf.rst b/source/content/glossar/bibliothek/dcat-examples/distribution-license-rdf.rst new file mode 100644 index 00000000..07f3a96c --- /dev/null +++ b/source/content/glossar/bibliothek/dcat-examples/distribution-license-rdf.rst @@ -0,0 +1,17 @@ +.. code-block:: xml + :caption: the license statement comes from a controlled vocabulary + :emphasize-lines: 8,9,10 + + + + + + + + + + + + \ No newline at end of file diff --git a/source/content/glossar/bibliothek/dcat-examples/distribution-license-ttl.rst b/source/content/glossar/bibliothek/dcat-examples/distribution-license-ttl.rst new file mode 100644 index 00000000..8a153df0 --- /dev/null +++ b/source/content/glossar/bibliothek/dcat-examples/distribution-license-ttl.rst @@ -0,0 +1,16 @@ +.. code-block:: Turtle + :caption: the license statement comes from a controlled vocabulary + :emphasize-lines: 8,9,10,11 + + @prefix dcat: . + @prefix dct: . + @prefix xsd: . + + + a dcat:Distribution ; + dcat:accessURL ; + dcterms:LicenseDocument [ + rdf:type rdf:type ; + rdf:about "http://dcat-ap.ch/vocabulary/licenses/terms_by" ; + rdf:resource "http://purl.org/dc/terms/RightsStatement" ; + ] . From 63fed7ac00d926b7a3ba7b2166d68c4c59faa06a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mich=C3=A8le=20Spichtig?= Date: Mon, 30 Oct 2023 18:19:58 +0100 Subject: [PATCH 07/14] adjust table dataset --- .../content/glossar/bibliothek/dcat-ap-ch.rst | 21 +++++++++++-------- .../dataset-documentation.rst | 2 +- .../dataset-documentation-rdf.rst | 16 ++++++++++++++ .../dataset-documentation-ttl.rst | 15 +++++++++++++ 4 files changed, 44 insertions(+), 10 deletions(-) create mode 100644 source/content/glossar/bibliothek/dcat-examples/dataset-documentation-rdf.rst create mode 100644 source/content/glossar/bibliothek/dcat-examples/dataset-documentation-ttl.rst diff --git a/source/content/glossar/bibliothek/dcat-ap-ch.rst b/source/content/glossar/bibliothek/dcat-ap-ch.rst index 6cd52df9..6081a915 100644 --- a/source/content/glossar/bibliothek/dcat-ap-ch.rst +++ b/source/content/glossar/bibliothek/dcat-ap-ch.rst @@ -209,7 +209,7 @@ Translatable elements are marked as such under usage notes. * - property - URI - - usage notes + - usage notes * - :ref:`dataset ` - dcat:dataset - **mandatory** @@ -272,10 +272,13 @@ Translatable elements are marked as such under usage notes. - optional, :fa:`exclamation` import format changed * - :ref:`related resource ` - dct:relation - - optional - * - :fa:`exclamation`:ref:`qualifiedRelation ` + - :fa:`exclamation` optional, **mandatory** for federal level, the legal basis must be indicated here + * - :fa:`exclamation` :ref:`qualifiedRelation ` - dcat:qualifiedRelation - optional :fa:`exclamation` replaces the property rdfs:seeAlso + * - :fa:`exclamation` :ref:`documentation ` + - dct:documentation + - optional, :fa:`exclamation` new property .. list-table:: Properties of dcat:Distribution @@ -307,12 +310,12 @@ Translatable elements are marked as such under usage notes. * - :ref:`media type ` - dct:mediaType - conditional - * - :ref:`format ` + * - :fa:`exclamation` :ref:`format ` - dct:format - - conditional + - conditional, :fa:`exclamation` use a Controlled Vocabulary (CV) * - :fa:`exclamation` :ref:`rights ` - dct:rights - - optional, for exceptional use only + - optional, :fa:`exclamation` for exceptional use only * - :ref:`language ` - dct:language - conditional @@ -657,12 +660,12 @@ dct:documentation (DCAT) .. toggle-header:: :header: Property ``dct:documentation`` of ``dcat:Dataset`` in Turtle - .. include:: dcat-examples/dataset-relation-ttl.rst + .. include:: dcat-examples/dataset-documentation-ttl.rst .. toggle-header:: - :header: Property ``dct:relation`` of ``dcat:Dataset`` in Rdf/xml + :header: Property ``dct:documentation`` of ``dcat:Dataset`` in Rdf/xml - .. include:: dcat-examples/dataset-relation-rdf.rst + .. include:: dcat-examples/dataset-documentation-rdf.rst .. _dcat-dataset-keyword: diff --git a/source/content/glossar/bibliothek/dcat-definitions/dataset-documentation.rst b/source/content/glossar/bibliothek/dcat-definitions/dataset-documentation.rst index cd85f963..72de6ae0 100644 --- a/source/content/glossar/bibliothek/dcat-definitions/dataset-documentation.rst +++ b/source/content/glossar/bibliothek/dcat-definitions/dataset-documentation.rst @@ -1,4 +1,4 @@ -:DCAT URI: foaf:page +:DCAT URI: dct:documentation :Domain: dcat:Dataset :Value: ``foaf:Document`` :Requirement Level: Optional diff --git a/source/content/glossar/bibliothek/dcat-examples/dataset-documentation-rdf.rst b/source/content/glossar/bibliothek/dcat-examples/dataset-documentation-rdf.rst new file mode 100644 index 00000000..3d9305a3 --- /dev/null +++ b/source/content/glossar/bibliothek/dcat-examples/dataset-documentation-rdf.rst @@ -0,0 +1,16 @@ +.. code-block:: xml + :emphasize-lines: 12,13 + :emphasize-lines: 12,13 + + + + + + + + + + diff --git a/source/content/glossar/bibliothek/dcat-examples/dataset-documentation-ttl.rst b/source/content/glossar/bibliothek/dcat-examples/dataset-documentation-ttl.rst new file mode 100644 index 00000000..98515361 --- /dev/null +++ b/source/content/glossar/bibliothek/dcat-examples/dataset-documentation-ttl.rst @@ -0,0 +1,15 @@ +.. code-block:: Turtle + :emphasize-lines: 7,8,9,10 + + @prefix rdf: . + @prefix dcat: . + @prefix foaf: . + + a dcat:Dataset ; + foaf:Document [ + rdf:about "https://www.covid19.admin.ch/api/data/documentation" ; + ], [ + rdf:about "https://de.wikipedia.org/wiki/Datenmanagement" ; + ] . + + From 005199e49f5243c961eb472bc0e6ecfb2f702d09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mich=C3=A8le=20Spichtig?= Date: Mon, 30 Oct 2023 22:00:04 +0100 Subject: [PATCH 08/14] link documentation --- source/content/glossar/bibliothek/dcat-ap-ch.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/content/glossar/bibliothek/dcat-ap-ch.rst b/source/content/glossar/bibliothek/dcat-ap-ch.rst index 6081a915..7294d08a 100644 --- a/source/content/glossar/bibliothek/dcat-ap-ch.rst +++ b/source/content/glossar/bibliothek/dcat-ap-ch.rst @@ -648,7 +648,7 @@ dct:relation (DCAT) .. include:: dcat-examples/dataset-relation-rdf.rst -.. _dcat-dataset-documenation: +.. _dcat-dataset-documentation: dct:documentation (DCAT) ^^^^^^^^^^^^^^^^^^^^^^^^ From 3bce03ab8297b6d64e5ea9fe3c6a986b67622743 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mich=C3=A8le=20Spichtig?= Date: Mon, 30 Oct 2023 22:19:54 +0100 Subject: [PATCH 09/14] fix example documentation rdf xml --- .../bibliothek/dcat-examples/dataset-documentation-rdf.rst | 3 +-- .../bibliothek/dcat-examples/dataset-documentation-ttl.rst | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/source/content/glossar/bibliothek/dcat-examples/dataset-documentation-rdf.rst b/source/content/glossar/bibliothek/dcat-examples/dataset-documentation-rdf.rst index 3d9305a3..e4772c9b 100644 --- a/source/content/glossar/bibliothek/dcat-examples/dataset-documentation-rdf.rst +++ b/source/content/glossar/bibliothek/dcat-examples/dataset-documentation-rdf.rst @@ -1,6 +1,5 @@ .. code-block:: xml - :emphasize-lines: 12,13 - :emphasize-lines: 12,13 + :emphasize-lines: 8,9 . @prefix dcat: . From f1a5b7b73bf3580bdb9663b8e77a42111683e8a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mich=C3=A8le=20Spichtig?= Date: Mon, 11 Dec 2023 15:04:59 +0100 Subject: [PATCH 10/14] changed minor errors --- source/content/glossar/bibliothek/dcat-ap-ch.rst | 10 +++++----- .../dcat-definitions/dataset-documentation.rst | 2 +- .../dcat-definitions/distribution-media-type.rst | 4 ++-- .../dcat-examples/distribution-access-url-ttl.rst | 1 - .../dcat-examples/distribution-media-type-ttl.rst | 1 - .../dcat-examples/distribution-modified-rdf.rst | 2 +- 6 files changed, 9 insertions(+), 11 deletions(-) diff --git a/source/content/glossar/bibliothek/dcat-ap-ch.rst b/source/content/glossar/bibliothek/dcat-ap-ch.rst index 7294d08a..ffd6870e 100644 --- a/source/content/glossar/bibliothek/dcat-ap-ch.rst +++ b/source/content/glossar/bibliothek/dcat-ap-ch.rst @@ -296,7 +296,7 @@ Translatable elements are marked as such under usage notes. - dcat:accessURL - **mandatory** * - :fa:`exclamation` :ref:`license ` - - dcat:license + - dct:license - **mandatory**, replaces dct:rights * - :ref:`title ` - dct:title @@ -308,7 +308,7 @@ Translatable elements are marked as such under usage notes. - dct:byteSize - conditional * - :ref:`media type ` - - dct:mediaType + - dcat:mediaType - conditional * - :fa:`exclamation` :ref:`format ` - dct:format @@ -650,7 +650,7 @@ dct:relation (DCAT) .. _dcat-dataset-documentation: -dct:documentation (DCAT) +foaf:page (DCAT) ^^^^^^^^^^^^^^^^^^^^^^^^ .. container:: Mapping @@ -658,12 +658,12 @@ dct:documentation (DCAT) .. include:: dcat-definitions/dataset-documentation.rst .. toggle-header:: - :header: Property ``dct:documentation`` of ``dcat:Dataset`` in Turtle + :header: Property ``foaf:page`` of ``dcat:Dataset`` in Turtle .. include:: dcat-examples/dataset-documentation-ttl.rst .. toggle-header:: - :header: Property ``dct:documentation`` of ``dcat:Dataset`` in Rdf/xml + :header: Property ``foaf:page`` of ``dcat:Dataset`` in Rdf/xml .. include:: dcat-examples/dataset-documentation-rdf.rst diff --git a/source/content/glossar/bibliothek/dcat-definitions/dataset-documentation.rst b/source/content/glossar/bibliothek/dcat-definitions/dataset-documentation.rst index 72de6ae0..f41decb1 100644 --- a/source/content/glossar/bibliothek/dcat-definitions/dataset-documentation.rst +++ b/source/content/glossar/bibliothek/dcat-definitions/dataset-documentation.rst @@ -1,6 +1,6 @@ :DCAT URI: dct:documentation :Domain: dcat:Dataset -:Value: ``foaf:Document`` +:Value: ``foaf:page`` :Requirement Level: Optional :Cardinality: 0..n :Description: documentation diff --git a/source/content/glossar/bibliothek/dcat-definitions/distribution-media-type.rst b/source/content/glossar/bibliothek/dcat-definitions/distribution-media-type.rst index 22ea74d4..80697123 100644 --- a/source/content/glossar/bibliothek/dcat-definitions/distribution-media-type.rst +++ b/source/content/glossar/bibliothek/dcat-definitions/distribution-media-type.rst @@ -1,6 +1,6 @@ -:DCAT URI: dct:mediaType +:DCAT URI: dcat:mediaType :Domain: dcat:Distribution -:Value: `dct:MediaTypeOrExtent`` must be a MIME type of http://www.iana.org/assignments/media-types/media-types.xhtml +:Value: ``dct:MediaType`` must be a MIME type of `[IANA-MEDIA-TYPES] `_ :Requirement Level: conditional, required if the distribution is a file accessible by a ``dcat:downloadURL`` :Cardinality: 0..1 :Description: Resource format of the data provided by the ``dcat:downloadURL`` diff --git a/source/content/glossar/bibliothek/dcat-examples/distribution-access-url-ttl.rst b/source/content/glossar/bibliothek/dcat-examples/distribution-access-url-ttl.rst index 1a8d4874..3d1a8cfc 100644 --- a/source/content/glossar/bibliothek/dcat-examples/distribution-access-url-ttl.rst +++ b/source/content/glossar/bibliothek/dcat-examples/distribution-access-url-ttl.rst @@ -4,7 +4,6 @@ @prefix dcat: . @prefix dct: . - @prefix xsd: . a dcat:Distribution ; diff --git a/source/content/glossar/bibliothek/dcat-examples/distribution-media-type-ttl.rst b/source/content/glossar/bibliothek/dcat-examples/distribution-media-type-ttl.rst index a788d51b..56ff2904 100644 --- a/source/content/glossar/bibliothek/dcat-examples/distribution-media-type-ttl.rst +++ b/source/content/glossar/bibliothek/dcat-examples/distribution-media-type-ttl.rst @@ -4,7 +4,6 @@ @prefix dcat: . @prefix dct: . - @prefix xsd: . a dcat:Distribution ; diff --git a/source/content/glossar/bibliothek/dcat-examples/distribution-modified-rdf.rst b/source/content/glossar/bibliothek/dcat-examples/distribution-modified-rdf.rst index 272a7993..01429d16 100644 --- a/source/content/glossar/bibliothek/dcat-examples/distribution-modified-rdf.rst +++ b/source/content/glossar/bibliothek/dcat-examples/distribution-modified-rdf.rst @@ -5,7 +5,7 @@ + xmlns:dct="http://purl.org/dc/terms/"> 2013-04-26T01:00:00Z From 60a61337374d245602144d6cfec896b67a70018b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mich=C3=A8le=20Spichtig?= Date: Mon, 11 Dec 2023 21:48:44 +0100 Subject: [PATCH 11/14] changes themes and license --- source/content/glossar/bibliothek/dcat-ap-ch.rst | 12 +++++++++++- .../bibliothek/dcat-definitions/dataset-theme.rst | 6 +++--- .../bibliothek/dcat-examples/dataset-theme-rdf.rst | 6 +++--- .../bibliothek/dcat-examples/dataset-theme-ttl.rst | 2 +- .../dcat-examples/deprecated/dataset-theme-rdf.rst | 14 ++++++++++++++ .../dcat-examples/deprecated/dataset-theme-ttl.rst | 11 +++++++++++ .../distribution-download-url-ttl.rst | 1 - .../dcat-examples/distribution-license-rdf.rst | 4 ++-- .../dcat-examples/distribution-license-ttl.rst | 11 +++++------ 9 files changed, 50 insertions(+), 17 deletions(-) create mode 100644 source/content/glossar/bibliothek/dcat-examples/deprecated/dataset-theme-rdf.rst create mode 100644 source/content/glossar/bibliothek/dcat-examples/deprecated/dataset-theme-ttl.rst diff --git a/source/content/glossar/bibliothek/dcat-ap-ch.rst b/source/content/glossar/bibliothek/dcat-ap-ch.rst index ffd6870e..079348dc 100644 --- a/source/content/glossar/bibliothek/dcat-ap-ch.rst +++ b/source/content/glossar/bibliothek/dcat-ap-ch.rst @@ -248,7 +248,7 @@ Translatable elements are marked as such under usage notes. - conditional * - :ref:`theme ` - dcat:theme - - conditional + - conditional, :fa:`exclamation` new vocabulary to use * - :fa:`exclamation` :ref:`landing page ` - dcat:landingPage - conditional, :fa:`exclamation` import format changed @@ -580,6 +580,16 @@ dcat:theme (DCAT) .. include:: dcat-examples/dataset-theme-rdf.rst +.. toggle-header:: + :header: Deprecated: Property ``dcat:theme`` of ``dcat:Dataset`` in Turtle + + .. include:: dcat-examples/deprecated/dataset-theme-ttl.rst + +.. toggle-header:: + :header: Deprecated: Property ``dcat:theme`` of ``dcat:Dataset`` in Rdf/xml + + .. include:: dcat-examples/deprecated/dataset-theme-rdf.rst + .. _dcat-dataset-language: dct:language (DCAT) diff --git a/source/content/glossar/bibliothek/dcat-definitions/dataset-theme.rst b/source/content/glossar/bibliothek/dcat-definitions/dataset-theme.rst index ba149c46..8c634614 100644 --- a/source/content/glossar/bibliothek/dcat-definitions/dataset-theme.rst +++ b/source/content/glossar/bibliothek/dcat-definitions/dataset-theme.rst @@ -1,7 +1,7 @@ :DCAT URI: dcat:theme :Domain: dcat:Dataset -:Value: DCAT-AP-CH has its own - `controlled vocabulary for the themes `__ +:Value: skos:Concept :Requirement Level: optional :Cardinality: 0..n -:Description: Categories that match the topic of the dataset +:Description: This property refers to a theme/category of the dataset. A dataset can be associated + with multiple themes. CV to be used: `[VOCAB-EU-THEME] `__ diff --git a/source/content/glossar/bibliothek/dcat-examples/dataset-theme-rdf.rst b/source/content/glossar/bibliothek/dcat-examples/dataset-theme-rdf.rst index 3e425950..8b6f7c5d 100644 --- a/source/content/glossar/bibliothek/dcat-examples/dataset-theme-rdf.rst +++ b/source/content/glossar/bibliothek/dcat-examples/dataset-theme-rdf.rst @@ -1,5 +1,5 @@ .. code-block:: xml - :caption: The categories are selected from a Swiss controlled vocabulary + :caption: The categories are selected from the EU theme vocabulary :emphasize-lines: 6,7 @@ -7,8 +7,8 @@ xmlns:dcat="http://www.w3.org/ns/dcat#"> - - + + diff --git a/source/content/glossar/bibliothek/dcat-examples/dataset-theme-ttl.rst b/source/content/glossar/bibliothek/dcat-examples/dataset-theme-ttl.rst index fac9d2f5..a6c22209 100644 --- a/source/content/glossar/bibliothek/dcat-examples/dataset-theme-ttl.rst +++ b/source/content/glossar/bibliothek/dcat-examples/dataset-theme-ttl.rst @@ -1,5 +1,5 @@ .. code-block:: Turtle - :caption: The categories are selected from a Swiss controlled vocabulary + :caption: The categories are selected from the EU theme vocabulary :emphasize-lines: 6,7 @prefix dcat: . diff --git a/source/content/glossar/bibliothek/dcat-examples/deprecated/dataset-theme-rdf.rst b/source/content/glossar/bibliothek/dcat-examples/deprecated/dataset-theme-rdf.rst new file mode 100644 index 00000000..3e425950 --- /dev/null +++ b/source/content/glossar/bibliothek/dcat-examples/deprecated/dataset-theme-rdf.rst @@ -0,0 +1,14 @@ +.. code-block:: xml + :caption: The categories are selected from a Swiss controlled vocabulary + :emphasize-lines: 6,7 + + + + + + + + + + diff --git a/source/content/glossar/bibliothek/dcat-examples/deprecated/dataset-theme-ttl.rst b/source/content/glossar/bibliothek/dcat-examples/deprecated/dataset-theme-ttl.rst new file mode 100644 index 00000000..591912a8 --- /dev/null +++ b/source/content/glossar/bibliothek/dcat-examples/deprecated/dataset-theme-ttl.rst @@ -0,0 +1,11 @@ +.. code-block:: Turtle + :caption: The categories are selected from a Swiss controlled vocabulary + :emphasize-lines: 6,7 + + @prefix dcat: . + @prefix dct: . + + + a dcat:Dataset ; + dcat:theme ; + . diff --git a/source/content/glossar/bibliothek/dcat-examples/distribution-download-url-ttl.rst b/source/content/glossar/bibliothek/dcat-examples/distribution-download-url-ttl.rst index 843c2266..a42eb27a 100644 --- a/source/content/glossar/bibliothek/dcat-examples/distribution-download-url-ttl.rst +++ b/source/content/glossar/bibliothek/dcat-examples/distribution-download-url-ttl.rst @@ -4,7 +4,6 @@ @prefix dcat: . @prefix dct: . - @prefix xsd: . a dcat:Distribution ; diff --git a/source/content/glossar/bibliothek/dcat-examples/distribution-license-rdf.rst b/source/content/glossar/bibliothek/dcat-examples/distribution-license-rdf.rst index 07f3a96c..ec647845 100644 --- a/source/content/glossar/bibliothek/dcat-examples/distribution-license-rdf.rst +++ b/source/content/glossar/bibliothek/dcat-examples/distribution-license-rdf.rst @@ -9,9 +9,9 @@ - + - + \ No newline at end of file diff --git a/source/content/glossar/bibliothek/dcat-examples/distribution-license-ttl.rst b/source/content/glossar/bibliothek/dcat-examples/distribution-license-ttl.rst index 8a153df0..1075e470 100644 --- a/source/content/glossar/bibliothek/dcat-examples/distribution-license-ttl.rst +++ b/source/content/glossar/bibliothek/dcat-examples/distribution-license-ttl.rst @@ -1,16 +1,15 @@ .. code-block:: Turtle :caption: the license statement comes from a controlled vocabulary - :emphasize-lines: 8,9,10,11 + :emphasize-lines: 7,8,9,10 @prefix dcat: . @prefix dct: . - @prefix xsd: . a dcat:Distribution ; dcat:accessURL ; - dcterms:LicenseDocument [ - rdf:type rdf:type ; - rdf:about "http://dcat-ap.ch/vocabulary/licenses/terms_by" ; - rdf:resource "http://purl.org/dc/terms/RightsStatement" ; + dct:license [ + rdf:type dct:LicenseDocument ; + rdf:about ; + rdf:resource ; ] . From 388f08c191175cbab1ba2f9e4c90e80f0e607725 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mich=C3=A8le=20Spichtig?= Date: Mon, 11 Dec 2023 22:21:13 +0100 Subject: [PATCH 12/14] add new property conform to --- .../content/glossar/bibliothek/dcat-ap-ch.rst | 22 +++++++++++++++++++ .../dcat-definitions/dataset-conforms-to.rst | 7 ++++++ .../dcat-examples/dataset-conforms-to-rdf.rst | 13 +++++++++++ .../dcat-examples/dataset-conforms-to-ttl.rst | 12 ++++++++++ 4 files changed, 54 insertions(+) create mode 100644 source/content/glossar/bibliothek/dcat-definitions/dataset-conforms-to.rst create mode 100644 source/content/glossar/bibliothek/dcat-examples/dataset-conforms-to-rdf.rst create mode 100644 source/content/glossar/bibliothek/dcat-examples/dataset-conforms-to-ttl.rst diff --git a/source/content/glossar/bibliothek/dcat-ap-ch.rst b/source/content/glossar/bibliothek/dcat-ap-ch.rst index 079348dc..1e3f8bcc 100644 --- a/source/content/glossar/bibliothek/dcat-ap-ch.rst +++ b/source/content/glossar/bibliothek/dcat-ap-ch.rst @@ -279,6 +279,9 @@ Translatable elements are marked as such under usage notes. * - :fa:`exclamation` :ref:`documentation ` - dct:documentation - optional, :fa:`exclamation` new property + * - :fa:`exclamation` :ref:`conforms to ` + - dct:conformsTo + - optional, :fa:`exclamation` new property .. list-table:: Properties of dcat:Distribution @@ -676,7 +679,26 @@ foaf:page (DCAT) :header: Property ``foaf:page`` of ``dcat:Dataset`` in Rdf/xml .. include:: dcat-examples/dataset-documentation-rdf.rst + +.. _dcat-dataset-conforms-to: + +dct:conformsTo (DCAT) +^^^^^^^^^^^^^^^^^^^^^^^^ + +.. container:: Mapping + + .. include:: dcat-definitions/dataset-conforms-to.rst + +.. toggle-header:: + :header: Property ``dct:conformsTo`` of ``dcat:Dataset`` in Turtle + + .. include:: dcat-examples/dataset-conforms-to-ttl.rst + +.. toggle-header:: + :header: Property ``dct:conformsTo`` of ``dcat:Dataset`` in Rdf/xml + .. include:: dcat-examples/dataset-conforms-to-rdf.rst + .. _dcat-dataset-keyword: dcat:keyword (DCAT) diff --git a/source/content/glossar/bibliothek/dcat-definitions/dataset-conforms-to.rst b/source/content/glossar/bibliothek/dcat-definitions/dataset-conforms-to.rst new file mode 100644 index 00000000..d86a007b --- /dev/null +++ b/source/content/glossar/bibliothek/dcat-definitions/dataset-conforms-to.rst @@ -0,0 +1,7 @@ +:DCAT URI: dct:conformsTo +:Domain: dcat:Dataset +:Value: ``dct:Standard`` +:Requirement Level: Optional +:Cardinality: 0..n +:Description: This property refers to an implementing rule or other specification. +:Usage Notes: This property SHOULD be used to indicate the model, schema, ontology, view or profile that this representation of a dataset conforms to. This is (generally) a complementary concern to the format or media-type. diff --git a/source/content/glossar/bibliothek/dcat-examples/dataset-conforms-to-rdf.rst b/source/content/glossar/bibliothek/dcat-examples/dataset-conforms-to-rdf.rst new file mode 100644 index 00000000..a3872162 --- /dev/null +++ b/source/content/glossar/bibliothek/dcat-examples/dataset-conforms-to-rdf.rst @@ -0,0 +1,13 @@ +.. code-block:: xml + :emphasize-lines: 7 + + + + + + + + + diff --git a/source/content/glossar/bibliothek/dcat-examples/dataset-conforms-to-ttl.rst b/source/content/glossar/bibliothek/dcat-examples/dataset-conforms-to-ttl.rst new file mode 100644 index 00000000..777319de --- /dev/null +++ b/source/content/glossar/bibliothek/dcat-examples/dataset-conforms-to-ttl.rst @@ -0,0 +1,12 @@ +.. code-block:: Turtle + :emphasize-lines: 6,7,8,9,10 + + @prefix rdf: . + @prefix dcat: . + @prefix dct: . + + + a dcat:Dataset ; + dct:conformsTo . + + From 825db0c99f68433030451ead0577b2aeaefd1543 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mich=C3=A8le=20Spichtig?= Date: Tue, 12 Dec 2023 10:23:43 +0100 Subject: [PATCH 13/14] add documentation on distribution --- .../content/glossar/bibliothek/dcat-ap-ch.rst | 24 ++++++++++++++++++- .../dataset-documentation.rst | 4 ++-- .../distribution-documentation.rst | 7 ++++++ .../distribution-documentation-rdf.rst | 14 +++++++++++ .../distribution-documentation-ttl.rst | 13 ++++++++++ 5 files changed, 59 insertions(+), 3 deletions(-) create mode 100644 source/content/glossar/bibliothek/dcat-definitions/distribution-documentation.rst create mode 100644 source/content/glossar/bibliothek/dcat-examples/distribution-documentation-rdf.rst create mode 100644 source/content/glossar/bibliothek/dcat-examples/distribution-documentation-ttl.rst diff --git a/source/content/glossar/bibliothek/dcat-ap-ch.rst b/source/content/glossar/bibliothek/dcat-ap-ch.rst index 1e3f8bcc..dcf3df2f 100644 --- a/source/content/glossar/bibliothek/dcat-ap-ch.rst +++ b/source/content/glossar/bibliothek/dcat-ap-ch.rst @@ -277,7 +277,7 @@ Translatable elements are marked as such under usage notes. - dcat:qualifiedRelation - optional :fa:`exclamation` replaces the property rdfs:seeAlso * - :fa:`exclamation` :ref:`documentation ` - - dct:documentation + - foaf:page - optional, :fa:`exclamation` new property * - :fa:`exclamation` :ref:`conforms to ` - dct:conformsTo @@ -334,6 +334,9 @@ Translatable elements are marked as such under usage notes. * - :ref:`coverage ` - dct:coverage - optional + * - :fa:`exclamation` :ref:`documentation ` + - foaf:page + - optional, :fa:`exclamation` new property .. _dcat-ap-ch-catalog: @@ -1123,3 +1126,22 @@ dct:license (DCAT) :header: Property ``dct:license`` of ``dcat:Distribution`` in Rdf/xml .. include:: dcat-examples/distribution-license-rdf.rst + +.. _dcat-distribution-documentation: + +foaf:page (DCAT) +^^^^^^^^^^^^^^^^^^^^^^^^ + +.. container:: Mapping + + .. include:: dcat-definitions/distribution-documentation.rst + +.. toggle-header:: + :header: Property ``foaf:page`` of ``dcat:Distribution`` in Turtle + + .. include:: dcat-examples/distribution-documentation-ttl.rst + +.. toggle-header:: + :header: Property ``foaf:page`` of ``dcat:Distribution`` in Rdf/xml + + .. include:: dcat-examples/distribution-documentation-rdf.rst diff --git a/source/content/glossar/bibliothek/dcat-definitions/dataset-documentation.rst b/source/content/glossar/bibliothek/dcat-definitions/dataset-documentation.rst index f41decb1..cd85f963 100644 --- a/source/content/glossar/bibliothek/dcat-definitions/dataset-documentation.rst +++ b/source/content/glossar/bibliothek/dcat-definitions/dataset-documentation.rst @@ -1,6 +1,6 @@ -:DCAT URI: dct:documentation +:DCAT URI: foaf:page :Domain: dcat:Dataset -:Value: ``foaf:page`` +:Value: ``foaf:Document`` :Requirement Level: Optional :Cardinality: 0..n :Description: documentation diff --git a/source/content/glossar/bibliothek/dcat-definitions/distribution-documentation.rst b/source/content/glossar/bibliothek/dcat-definitions/distribution-documentation.rst new file mode 100644 index 00000000..42b2fc83 --- /dev/null +++ b/source/content/glossar/bibliothek/dcat-definitions/distribution-documentation.rst @@ -0,0 +1,7 @@ +:DCAT URI: foaf:page +:Domain: dcat:Distribution +:Value: ``foaf:Document`` +:Requirement Level: Optional +:Cardinality: 0..n +:Description: documentation +:Usage Notes: This property refers to a page or document about this Distribution. diff --git a/source/content/glossar/bibliothek/dcat-examples/distribution-documentation-rdf.rst b/source/content/glossar/bibliothek/dcat-examples/distribution-documentation-rdf.rst new file mode 100644 index 00000000..e879d0df --- /dev/null +++ b/source/content/glossar/bibliothek/dcat-examples/distribution-documentation-rdf.rst @@ -0,0 +1,14 @@ +.. code-block:: xml + :emphasize-lines: 8,9 + + + + + + + + + diff --git a/source/content/glossar/bibliothek/dcat-examples/distribution-documentation-ttl.rst b/source/content/glossar/bibliothek/dcat-examples/distribution-documentation-ttl.rst new file mode 100644 index 00000000..cb1e9667 --- /dev/null +++ b/source/content/glossar/bibliothek/dcat-examples/distribution-documentation-ttl.rst @@ -0,0 +1,13 @@ +.. code-block:: Turtle + :emphasize-lines: 6,7,8,9,10 + + @prefix rdf: . + @prefix dcat: . + @prefix foaf: . + + a dcat:Distribution ; + foaf:Document [ + rdf:about "https://www.covid19.admin.ch/api/data/documentation#data-context-api" + ] . + + From 6c0159da24bc18fb5136f1b3b326c6cea366df88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mich=C3=A8le=20Spichtig?= Date: Mon, 18 Dec 2023 08:42:25 +0100 Subject: [PATCH 14/14] minor adjustment media type and theme --- source/content/glossar/bibliothek/dcat-ap-ch.rst | 4 ++-- .../bibliothek/dcat-examples/distribution-media-type-ttl.rst | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/source/content/glossar/bibliothek/dcat-ap-ch.rst b/source/content/glossar/bibliothek/dcat-ap-ch.rst index dcf3df2f..0db65490 100644 --- a/source/content/glossar/bibliothek/dcat-ap-ch.rst +++ b/source/content/glossar/bibliothek/dcat-ap-ch.rst @@ -246,7 +246,7 @@ Translatable elements are marked as such under usage notes. * - :ref:`modified ` - dct:modified - conditional - * - :ref:`theme ` + * - :fa:`exclamation` :ref:`theme ` - dcat:theme - conditional, :fa:`exclamation` new vocabulary to use * - :fa:`exclamation` :ref:`landing page ` @@ -939,7 +939,7 @@ dct:rights (DCAT) .. _dcat-distribution-media-type: -dct:mediaType (DCAT) +dcat:mediaType (DCAT) ^^^^^^^^^^^^^^^^^^^^^^^^ .. container:: Mapping diff --git a/source/content/glossar/bibliothek/dcat-examples/distribution-media-type-ttl.rst b/source/content/glossar/bibliothek/dcat-examples/distribution-media-type-ttl.rst index 56ff2904..97fb3f49 100644 --- a/source/content/glossar/bibliothek/dcat-examples/distribution-media-type-ttl.rst +++ b/source/content/glossar/bibliothek/dcat-examples/distribution-media-type-ttl.rst @@ -1,6 +1,6 @@ .. code-block:: Turtle :caption: The mediaType is used to specify the file format of a download url - :emphasize-lines: 8 + :emphasize-lines: 7 @prefix dcat: . @prefix dct: .