From d48ff9521b7c9c4a89979ca93978ad06df8f2472 Mon Sep 17 00:00:00 2001 From: Jari Voutilainen Date: Tue, 10 Dec 2024 12:55:06 +0200 Subject: [PATCH 1/2] AV-2397: Update namespace documentation --- doc/dcat-ap/model.yml | 6 ++++++ docker/nginx/www/ns/index.html | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/doc/dcat-ap/model.yml b/doc/dcat-ap/model.yml index 80cc66e50..c3ec4e916 100644 --- a/doc/dcat-ap/model.yml +++ b/doc/dcat-ap/model.yml @@ -65,6 +65,12 @@ classes: description: This property contains a name given to the Catalogue. This property can be repeated for parallel language versions of the name. min: 1 max: n + - name: collection type + term: adfi:collectionType + range: rdfs:Literal + description: This property defines if the dataset describes open data or interoperability tools + min: 1 + max: 1 recommended: - name: homepage term: foaf:homepage diff --git a/docker/nginx/www/ns/index.html b/docker/nginx/www/ns/index.html index f29ab7e9b..e511970d1 100644 --- a/docker/nginx/www/ns/index.html +++ b/docker/nginx/www/ns/index.html @@ -93,6 +93,12 @@

Properties

1..n This property contains a name given to the Catalogue. This property can be repeated for parallel language versions of the name. + + adfi:collectionType + rdfs:Literal + 1..1 + This property defines if the dataset describes open data or interoperability tools + From 8ee666bb2b80effec763bcbd8e2464f5e8a9d26b Mon Sep 17 00:00:00 2001 From: Jari Voutilainen Date: Tue, 10 Dec 2024 12:55:31 +0200 Subject: [PATCH 2/2] AV-2397: Add collection type to dcat profile --- ckan/ckanext/ckanext-ytp_main/ckanext/ytp/dcat.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ckan/ckanext/ckanext-ytp_main/ckanext/ytp/dcat.py b/ckan/ckanext/ckanext-ytp_main/ckanext/ytp/dcat.py index eeaf8714b..815021a03 100644 --- a/ckan/ckanext/ckanext-ytp_main/ckanext/ytp/dcat.py +++ b/ckan/ckanext/ckanext-ytp_main/ckanext/ytp/dcat.py @@ -573,6 +573,9 @@ def graph_from_dataset(self, dataset_dict, dataset_ref): issued_date = Literal(date_released, datatype=XSD.date) g.add((dataset_ref, DCT.issued, issued_date)) + # adfi:collectionType + g.add((dataset_ref, ADFI.collectionType, Literal(dataset_dict.get('collection_type')) )) + def graph_from_catalog(self, catalog_dict, catalog_ref): # Fetch organization list for graph_from_dataset to use