diff --git a/CHANGELOG.md b/CHANGELOG.md index e28fd6300cb2017388449a09d488bc2971b12ac9..cd59e4efe8ae36d2df44687fe54897f1dcc0a25a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,7 +15,27 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - This update requires changes to your `production.ini` file: Beaker keys have been removed. Use SECRET_KEY, etc. -## [2.4.4] +## [2.4.6] - 2025-01-09 + +### Added + +- Added parsing logic for `politicalGeocodingURI` in `ODSHDCATdeProfile`. + - If a dataset contains a `politicalGeocodingURI` but lacks a `spatial_uri`, the `politicalGeocodingURI` value is now extracted and used to populate the `spatial_uri` field in the dataset's extras. + - This ensures that datasets with a political geocoding URI but without a spatial URI are handled correctly in the profile. + +## [2.4.5] - 2024-12-17 + +### Added + +- Added historical and regional political geocoding data for locations such as Eckernförde, Wandsbek, Altona, and Lübeck in `sh_bb.csv`. + +### Changed + +- Updated `tag_name_validator` to replace newlines with whitespaces and ensure tags are non-empty during validation. +- Replaced `schema:startDate` with `dcat:startDate` and `schema:endDate` with `dcat:endDate` in test files. +- Changed order of entries for CC Zero and CC BY 4.0 in `licenses.json`. + +## [2.4.4] 2024-09-23 ### Added diff --git a/ckanext/odsh/i18n/ckanext-odsh.pot b/ckanext/odsh/i18n/ckanext-odsh.pot index 63cde313e2ec2814a882e724152f0cda475ddfb5..b5c63ccda9b1eb15933ff9c6c31ac434f0e3e158 100644 --- a/ckanext/odsh/i18n/ckanext-odsh.pot +++ b/ckanext/odsh/i18n/ckanext-odsh.pot @@ -6,7 +6,7 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: ckanext-odsh 2.4.4\n" +"Project-Id-Version: ckanext-odsh 2.4.6\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" "POT-Creation-Date: 2024-09-20 11:17+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" diff --git a/ckanext/odsh/profiles/odsh_dcat_de_profile.py b/ckanext/odsh/profiles/odsh_dcat_de_profile.py index 351e78d86c347dff35c0c523cb0d20ca8a70ff80..eb57db6025cd897335de0ddcc8e74f269e29086c 100644 --- a/ckanext/odsh/profiles/odsh_dcat_de_profile.py +++ b/ckanext/odsh/profiles/odsh_dcat_de_profile.py @@ -33,6 +33,7 @@ class ODSHDCATdeProfile(DCATdeProfile): ) self._parse_distributions(dataset_dict, dataset_ref) self._parse_type(dataset_dict, dataset_ref) + self._parse_political_geocoding_uri(dataset_dict, dataset_ref) self._parse_references(dataset_dict, dataset_ref) self._parse_applicable_legislation(dataset_dict, dataset_ref) self._parse_hvd_category(dataset_dict, dataset_ref) @@ -104,6 +105,16 @@ class ODSHDCATdeProfile(DCATdeProfile): ds_utils.insert_new_extras_field( dataset_dict, 'hvdCategory', "{" + value + "}") + def _parse_political_geocoding_uri(self, dataset_dict, dataset_ref): + """There are datasets that have a politicalGeocodingURI but no spatial_uri.""" + extras = extras=dataset_dict.get('extras') + political_geocoding_uri = helpers_odsh.odsh_extract_value_from_extras(extras=extras, key='politicalGeocodingURI') + spatial_uri = helpers_odsh.odsh_extract_value_from_extras(extras=extras, key='spatial_uri') + if not spatial_uri and political_geocoding_uri: + if '"' in political_geocoding_uri: + political_geocoding_uri = political_geocoding_uri.split('"')[1] + ds_utils.insert_new_extras_field( dataset_dict, 'spatial_uri', political_geocoding_uri) + def _belongs_to_collection(self, dataset_dict, dataset_ref): dct_is_version_of = self._object(dataset_ref, DCT.isVersionOf) belongs_to_collection = True if dct_is_version_of else False diff --git a/ckanext/odsh/resources/licenses.json b/ckanext/odsh/resources/licenses.json index e27147fbef3a8d8812c71dee54bb6d9026a296b4..54f02ade3085fe0c22a4892ad71905834f30ceef 100644 --- a/ckanext/odsh/resources/licenses.json +++ b/ckanext/odsh/resources/licenses.json @@ -1,4 +1,20 @@ [ + { + "id": "http://dcat-ap.de/def/licenses/cc-zero", + "od_conformance": "approved", + "osd_conformance": "not reviewed", + "status": "active", + "title": "Creative Commons CC Zero License (cc-zero)", + "url": "http://www.opendefinition.org/licenses/cc-zero" + }, + { + "id": "http://dcat-ap.de/def/licenses/cc-by/4.0", + "od_conformance": "approved", + "osd_conformance": "not reviewed", + "status": "active", + "title": "Creative Commons Namensnennung – 4.0 International (CC BY 4.0)", + "url": "http://creativecommons.org/licenses/by/4.0/" + }, { "id": "http://dcat-ap.de/def/licenses/ccpdm/1.0", "od_conformance": "approved", @@ -31,22 +47,6 @@ "title": "Amtliches Werk, lizenzfrei nach §5 Abs. 1 UrhG", "url": "http://www.gesetze-im-internet.de/urhg/__5.html" }, - { - "id": "http://dcat-ap.de/def/licenses/cc-zero", - "od_conformance": "approved", - "osd_conformance": "not reviewed", - "status": "active", - "title": "Creative Commons CC Zero License (cc-zero)", - "url": "http://www.opendefinition.org/licenses/cc-zero" - }, - { - "id": "http://dcat-ap.de/def/licenses/cc-by/4.0", - "od_conformance": "approved", - "osd_conformance": "not reviewed", - "status": "active", - "title": "Creative Commons Namensnennung – 4.0 International (CC BY 4.0)", - "url": "http://creativecommons.org/licenses/by/4.0/" - }, { "id": "http://dcat-ap.de/def/licenses/cc-by-nd/4.0", "od_conformance": "not reviewed", diff --git a/ckanext/odsh/resources/sh_bb.csv b/ckanext/odsh/resources/sh_bb.csv index 7d31c85bf8a90f3cc721e9252e3d2c2fbda4dc7e..a6995e71c1686fa34b84f82770902f46de0c0ced 100644 --- a/ckanext/odsh/resources/sh_bb.csv +++ b/ckanext/odsh/resources/sh_bb.csv @@ -2334,3 +2334,8 @@ http://dcat-ap.de/def/politicalGeocoding/municipalityKey/01062094 Gemeinde Wesen http://dcat-ap.de/def/politicalGeocoding/municipalityKey/01056025 Gemeinde Helgoland {"type":"Feature","properties":{"name":"Gemeinde Helgoland"},"geometry":{"type":"Polygon","coordinates":[[[7.8685,54.1693],[7.8685,54.1931],[7.9228,54.1931],[7.9228,54.1693],[7.8685,54.1693]]]}} http://dcat-ap.de/def/politicalGeocoding/municipalityKey/01059189 Gemeinde Broderby-Goltoft {"type":"Feature","properties":{"name":"Gemeinde Broderby-Goltoft"},"geometry":{"type":"Polygon","coordinates":[[[9.6709,54.5153],[9.6709,54.5653],[9.7413,54.5653],[9.7413,54.5153],[9.6709,54.5153]]]}} http://dcat-ap.de/def/politicalGeocoding/municipalityKey/01059188 Gemeinde Stapel {"type":"Feature","properties":{"name":"Gemeinde Stapel"},"geometry":{"type":"Polygon","coordinates":[[[9.1715,54.3157],[9.1715,54.386],[9.3099,54.386],[9.3099,54.3157],[9.1715,54.3157]]]}} +http://gov.genealogy.net/object_214361 Landkreis Eckernförde (1970 aufgelöst) {"type":"Feature","properties":{"name":"Landkreis Eckernförde (1970 aufgelöst)"},"geometry":{"type":"Polygon","coordinates":[[[9.5636,54.281],[9.5636,54.6736],[10.1964,54.6736],[10.1964,54.281],[9.5636,54.281]]]}} +http://gov.genealogy.net/object_214378 Stadt Wandsbek (bis 1937 zu SH) {"geometry":{"coordinates":[[[10.0202046,53.5595423],[10.0202046,53.7394378],[10.2219513,53.7394378],[10.2219513,53.5595423],[10.0202046,53.5595423]]],"type":"Polygon"},"properties":{"name":"Stadt Wandsbek (bis 1937 zu SH)","uri":"http://gov.genealogy.net/object_214378"},"type":"Feature"} +http://gov.genealogy.net/object_214369 Stadt Altona (bis 1937 zu SH) {"geometry":{"coordinates":[[[9.7301155,53.5415333],[9.7301155,53.6314046],[9.9769646,53.6314046],[9.9769646,53.5415333],[9.7301155,53.5415333]]],"type":"Polygon"},"properties":{"name":"Stadt Altona (bis 1937 zu SH)","uri":"http://gov.genealogy.net/object_214369"},"type":"Feature"} +http://gov.genealogy.net/object_214367 Landkreis Husum (1970 aufgelöst) {"geometry":{"coordinates":[[[8.5119,54.381],[8.5119,54.7131],[9.3011,54.7131],[9.3011,54.381],[8.5119,54.381]]],"type":"Polygon"},"properties":{"name":"Landkreis Husum (1970 aufgelöst)","uri":"http://gov.genealogy.net/object_214367"},"type":"Feature"} +http://dcat-ap.de/def/politicalGeocoding/regionalKey/010030000000 Stadt Lübeck {"type":"Feature","properties":{"name":"Stadt Lübeck"},"geometry":{"type":"Polygon","coordinates":[[[10.5547,53.7682],[10.5547,53.9937],[10.9671,53.9937],[10.9671,53.7682],[10.5547,53.7682]]]}} diff --git a/ckanext/odsh/tests/resources/collection1.rdf b/ckanext/odsh/tests/resources/collection1.rdf index 8ffd258536049afa2bd76a6a10196bf05b992386..be85482411e86883c61ca6d85c84518245da7c2f 100644 --- a/ckanext/odsh/tests/resources/collection1.rdf +++ b/ckanext/odsh/tests/resources/collection1.rdf @@ -67,8 +67,8 @@ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:schema="http://sch </dct:spatial> <dct:temporal> <dct:PeriodOfTime> - <schema:startDate rdf:datatype="http://www.w3.org/2001/XMLSchema#date">2017-04-01</schema:startDate> - <schema:endDate rdf:datatype="http://www.w3.org/2001/XMLSchema#date">2017-04-30</schema:endDate> + <dcat:startDate rdf:datatype="http://www.w3.org/2001/XMLSchema#date">2017-04-01</dcat:startDate> + <dcat:endDate rdf:datatype="http://www.w3.org/2001/XMLSchema#date">2017-04-30</dcat:endDate> </dct:PeriodOfTime> </dct:temporal> <dcat:keyword>Soziales Entschädigungsrecht</dcat:keyword> @@ -115,8 +115,8 @@ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:schema="http://sch </dct:spatial> <dct:temporal> <dct:PeriodOfTime> - <schema:startDate rdf:datatype="http://www.w3.org/2001/XMLSchema#date">2017-03-01</schema:startDate> - <schema:endDate rdf:datatype="http://www.w3.org/2001/XMLSchema#date">2017-03-31</schema:endDate> + <dcat:startDate rdf:datatype="http://www.w3.org/2001/XMLSchema#date">2017-03-01</dcat:startDate> + <dcat:endDate rdf:datatype="http://www.w3.org/2001/XMLSchema#date">2017-03-31</dcat:endDate> </dct:PeriodOfTime> </dct:temporal> <dcat:keyword>Soziales Entschädigungsrecht</dcat:keyword> @@ -163,8 +163,8 @@ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:schema="http://sch </dct:spatial> <dct:temporal> <dct:PeriodOfTime> - <schema:startDate rdf:datatype="http://www.w3.org/2001/XMLSchema#date">2017-02-01</schema:startDate> - <schema:endDate rdf:datatype="http://www.w3.org/2001/XMLSchema#date">2017-02-28</schema:endDate> + <dcat:startDate rdf:datatype="http://www.w3.org/2001/XMLSchema#date">2017-02-01</dcat:startDate> + <dcat:endDate rdf:datatype="http://www.w3.org/2001/XMLSchema#date">2017-02-28</dcat:endDate> </dct:PeriodOfTime> </dct:temporal> <dcat:keyword>Soziales Entschädigungsrecht</dcat:keyword> @@ -211,8 +211,8 @@ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:schema="http://sch </dct:spatial> <dct:temporal> <dct:PeriodOfTime> - <schema:startDate rdf:datatype="http://www.w3.org/2001/XMLSchema#date">2017-01-01</schema:startDate> - <schema:endDate rdf:datatype="http://www.w3.org/2001/XMLSchema#date">2017-01-31</schema:endDate> + <dcat:startDate rdf:datatype="http://www.w3.org/2001/XMLSchema#date">2017-01-01</dcat:startDate> + <dcat:endDate rdf:datatype="http://www.w3.org/2001/XMLSchema#date">2017-01-31</dcat:endDate> </dct:PeriodOfTime> </dct:temporal> <dcat:keyword>Soziales Entschädigungsrecht</dcat:keyword> @@ -259,8 +259,8 @@ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:schema="http://sch </dct:spatial> <dct:temporal> <dct:PeriodOfTime> - <schema:startDate rdf:datatype="http://www.w3.org/2001/XMLSchema#date">2016-12-01</schema:startDate> - <schema:endDate rdf:datatype="http://www.w3.org/2001/XMLSchema#date">2016-12-31</schema:endDate> + <dcat:startDate rdf:datatype="http://www.w3.org/2001/XMLSchema#date">2016-12-01</dcat:startDate> + <dcat:endDate rdf:datatype="http://www.w3.org/2001/XMLSchema#date">2016-12-31</dcat:endDate> </dct:PeriodOfTime> </dct:temporal> <dcat:keyword>Soziales Entschädigungsrecht</dcat:keyword> @@ -307,8 +307,8 @@ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:schema="http://sch </dct:spatial> <dct:temporal> <dct:PeriodOfTime> - <schema:startDate rdf:datatype="http://www.w3.org/2001/XMLSchema#date">2017-01-01</schema:startDate> - <schema:endDate rdf:datatype="http://www.w3.org/2001/XMLSchema#date">2017-12-31</schema:endDate> + <dcat:startDate rdf:datatype="http://www.w3.org/2001/XMLSchema#date">2017-01-01</dcat:startDate> + <dcat:endDate rdf:datatype="http://www.w3.org/2001/XMLSchema#date">2017-12-31</dcat:endDate> </dct:PeriodOfTime> </dct:temporal> <dcat:keyword>Soziales Entschädigungsrecht</dcat:keyword> @@ -355,8 +355,8 @@ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:schema="http://sch </dct:spatial> <dct:temporal> <dct:PeriodOfTime> - <schema:startDate rdf:datatype="http://www.w3.org/2001/XMLSchema#date">2016-01-01</schema:startDate> - <schema:endDate rdf:datatype="http://www.w3.org/2001/XMLSchema#date">2016-12-31</schema:endDate> + <dcat:startDate rdf:datatype="http://www.w3.org/2001/XMLSchema#date">2016-01-01</dcat:startDate> + <dcat:endDate rdf:datatype="http://www.w3.org/2001/XMLSchema#date">2016-12-31</dcat:endDate> </dct:PeriodOfTime> </dct:temporal> <dcat:keyword>Soziales Entschädigungsrecht</dcat:keyword> @@ -403,8 +403,8 @@ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:schema="http://sch </dct:spatial> <dct:temporal> <dct:PeriodOfTime> - <schema:startDate rdf:datatype="http://www.w3.org/2001/XMLSchema#date">2015-01-01</schema:startDate> - <schema:endDate rdf:datatype="http://www.w3.org/2001/XMLSchema#date">2015-12-31</schema:endDate> + <dcat:startDate rdf:datatype="http://www.w3.org/2001/XMLSchema#date">2015-01-01</dcat:startDate> + <dcat:endDate rdf:datatype="http://www.w3.org/2001/XMLSchema#date">2015-12-31</dcat:endDate> </dct:PeriodOfTime> </dct:temporal> <dcat:keyword>Soziales Entschädigungsrecht</dcat:keyword> @@ -450,8 +450,8 @@ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:schema="http://sch </dct:spatial> <dct:temporal> <dct:PeriodOfTime> - <schema:startDate rdf:datatype="http://www.w3.org/2001/XMLSchema#date">2015-01-01</schema:startDate> - <schema:endDate rdf:datatype="http://www.w3.org/2001/XMLSchema#date">2015-12-31</schema:endDate> + <dcat:startDate rdf:datatype="http://www.w3.org/2001/XMLSchema#date">2015-01-01</dcat:startDate> + <dcat:endDate rdf:datatype="http://www.w3.org/2001/XMLSchema#date">2015-12-31</dcat:endDate> </dct:PeriodOfTime> </dct:temporal> <dcat:keyword>Soziales Entschädigungsrecht</dcat:keyword> diff --git a/ckanext/odsh/tests_wip/rdf_catalog.xml b/ckanext/odsh/tests_wip/rdf_catalog.xml index 568a73e57844b71d7e0d311b5de8167b1218d839..536c2516fa6c41460b664c3630b0383c1f2b8228 100644 --- a/ckanext/odsh/tests_wip/rdf_catalog.xml +++ b/ckanext/odsh/tests_wip/rdf_catalog.xml @@ -22,8 +22,8 @@ <dcat:distribution rdf:resource="http://192.168.57.3:5000/dataset/232f9ecc-0d05-404e-aa1f-b4493ad75b21/resource/d1ece97b-4e29-4991-be19-f9ea91eb24c1"/> <dct:temporal> <dct:PeriodOfTime rdf:nodeID="N661fe56a12cc408a8bc6605a43b755ba"> - <schema:startDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</schema:startDate> - <schema:endDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</schema:endDate> + <dcat:startDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</dcat:startDate> + <dcat:endDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</dcat:endDate> </dct:PeriodOfTime> </dct:temporal> <dct:identifier>232f9ecc-0d05-404e-aa1f-b4493ad75b21</dct:identifier> @@ -43,8 +43,8 @@ <dct:title>Test Title</dct:title> <dct:temporal> <dct:PeriodOfTime rdf:nodeID="N3953a2e54b164ee9aa618ea4f450c127"> - <schema:startDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</schema:startDate> - <schema:endDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</schema:endDate> + <dcat:startDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</dcat:startDate> + <dcat:endDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</dcat:endDate> </dct:PeriodOfTime> </dct:temporal> <dct:license rdf:resource="http://dcat-ap.de/def/licenses/dl-by-de/2.0"/> @@ -57,8 +57,8 @@ <dct:title>Test Title</dct:title> <dct:temporal> <dct:PeriodOfTime rdf:nodeID="N8dee749f82a242d4b02b61164c5d6566"> - <schema:startDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</schema:startDate> - <schema:endDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</schema:endDate> + <dcat:startDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</dcat:startDate> + <dcat:endDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</dcat:endDate> </dct:PeriodOfTime> </dct:temporal> <dct:identifier>4987ae1a-de01-4f1f-933b-8ffc09c10bae</dct:identifier> @@ -85,8 +85,8 @@ <dcat:distribution rdf:resource="http://192.168.57.3:5000/dataset/62fc297c-c92e-44d1-b3f6-bd8248100278/resource/8006c016-50b9-46ab-9d14-68a57ca20558"/> <dct:temporal> <dct:PeriodOfTime rdf:nodeID="Na5df53a2d5c348c48757442a817da997"> - <schema:endDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</schema:endDate> - <schema:startDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</schema:startDate> + <dcat:endDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</dcat:endDate> + <dcat:startDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</dcat:startDate> </dct:PeriodOfTime> </dct:temporal> </dcat:Dataset> @@ -99,8 +99,8 @@ <dct:issued rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</dct:issued> <dct:temporal> <dct:PeriodOfTime rdf:nodeID="Nbd9dfd5e57254e5e9fbd82c403d76b93"> - <schema:endDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</schema:endDate> - <schema:startDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</schema:startDate> + <dcat:endDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</dcat:endDate> + <dcat:startDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</dcat:startDate> </dct:PeriodOfTime> </dct:temporal> <dct:modified rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2019-06-07T12:10:54.732389</dct:modified> @@ -122,8 +122,8 @@ <dcat:distribution rdf:resource="http://192.168.57.3:5000/dataset/7643e445-78b5-4a6a-9866-b372d0851b5f/resource/e9682deb-73b4-4176-8de8-303c2baaaff6"/> <dct:temporal> <dct:PeriodOfTime rdf:nodeID="Nd4cf42df3dfa4d14b3531942a559753b"> - <schema:endDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</schema:endDate> - <schema:startDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</schema:startDate> + <dcat:endDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</dcat:endDate> + <dcat:startDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</dcat:startDate> </dct:PeriodOfTime> </dct:temporal> <dcatde:contributorID rdf:resource="http://dcat-ap.de/def/contributors/schleswigHolstein"/> @@ -141,8 +141,8 @@ <dct:title>Test Title</dct:title> <dct:temporal> <dct:PeriodOfTime rdf:nodeID="N32b91e801dbb469b8eef7c73b2a0b80f"> - <schema:endDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</schema:endDate> - <schema:startDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</schema:startDate> + <dcat:endDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</dcat:endDate> + <dcat:startDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</dcat:startDate> </dct:PeriodOfTime> </dct:temporal> <dct:modified rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2019-06-07T15:09:04.864959</dct:modified> @@ -158,8 +158,8 @@ <dct:title>Test Title</dct:title> <dct:temporal> <dct:PeriodOfTime rdf:nodeID="N8bf1146b703e4b0f8735e0254c3b6ac5"> - <schema:startDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</schema:startDate> - <schema:endDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</schema:endDate> + <dcat:startDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</dcat:startDate> + <dcat:endDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</dcat:endDate> </dct:PeriodOfTime> </dct:temporal> <dct:spatial rdf:resource="http://dcat-ap.de/def/politicalGeocoding/districtKey/01001"/> @@ -183,8 +183,8 @@ <dct:issued rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</dct:issued> <dct:temporal> <dct:PeriodOfTime rdf:nodeID="N47952854e9a644ef93001d35edbf8540"> - <schema:endDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</schema:endDate> - <schema:startDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</schema:startDate> + <dcat:endDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</dcat:endDate> + <dcat:startDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</dcat:startDate> </dct:PeriodOfTime> </dct:temporal> <dct:publisher rdf:resource="http://192.168.57.3:5000/organization/61263ac6-64cd-4048-90fc-767ddf45f3b7"/> @@ -202,8 +202,8 @@ <dct:issued rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</dct:issued> <dct:temporal> <dct:PeriodOfTime rdf:nodeID="Nd4fd10034ebc4618b61531c1f16315b2"> - <schema:endDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</schema:endDate> - <schema:startDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</schema:startDate> + <dcat:endDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</dcat:endDate> + <dcat:startDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</dcat:startDate> </dct:PeriodOfTime> </dct:temporal> <dct:publisher rdf:resource="http://192.168.57.3:5000/organization/61263ac6-64cd-4048-90fc-767ddf45f3b7"/> @@ -219,8 +219,8 @@ <dct:title>Test Title</dct:title> <dct:temporal> <dct:PeriodOfTime rdf:nodeID="Nfd5090569b364ce1a8e32700aae7b50b"> - <schema:endDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</schema:endDate> - <schema:startDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</schema:startDate> + <dcat:endDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</dcat:endDate> + <dcat:startDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</dcat:startDate> </dct:PeriodOfTime> </dct:temporal> <dct:modified rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2019-06-07T12:55:09.977376</dct:modified> @@ -241,8 +241,8 @@ <dct:spatial rdf:resource="http://dcat-ap.de/def/politicalGeocoding/districtKey/01001"/> <dct:temporal> <dct:PeriodOfTime rdf:nodeID="N2b05001b9d6f4e3f920e2e74af15ff40"> - <schema:endDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</schema:endDate> - <schema:startDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</schema:startDate> + <dcat:endDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</dcat:endDate> + <dcat:startDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</dcat:startDate> </dct:PeriodOfTime> </dct:temporal> <dct:publisher rdf:resource="http://192.168.57.3:5000/organization/61263ac6-64cd-4048-90fc-767ddf45f3b7"/> @@ -258,8 +258,8 @@ <dcat:Dataset rdf:about="http://192.168.57.3:5000/dataset/a981e2c3-b592-4c0f-8cca-edd9ba145752"> <dct:temporal> <dct:PeriodOfTime rdf:nodeID="N093bd92d01cd455da12080bdcf142ac9"> - <schema:startDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</schema:startDate> - <schema:endDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</schema:endDate> + <dcat:startDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</dcat:startDate> + <dcat:endDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</dcat:endDate> </dct:PeriodOfTime> </dct:temporal> <dct:identifier>a981e2c3-b592-4c0f-8cca-edd9ba145752</dct:identifier> @@ -282,8 +282,8 @@ <dcat:distribution rdf:resource="http://192.168.57.3:5000/dataset/b8618a6a-378a-49e9-a2be-8f223bfea755/resource/d00926a2-430c-4d38-ab20-b11c846b9cd5"/> <dct:temporal> <dct:PeriodOfTime rdf:nodeID="N0aaba25869b741a59f90acc84704b936"> - <schema:endDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</schema:endDate> - <schema:startDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</schema:startDate> + <dcat:endDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</dcat:endDate> + <dcat:startDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</dcat:startDate> </dct:PeriodOfTime> </dct:temporal> <dct:spatial rdf:resource="http://dcat-ap.de/def/politicalGeocoding/districtKey/01001"/> @@ -309,8 +309,8 @@ <dct:spatial rdf:resource="http://dcat-ap.de/def/politicalGeocoding/districtKey/01001"/> <dct:temporal> <dct:PeriodOfTime rdf:nodeID="Nc9874f689d45429f8100f7fd40e1946d"> - <schema:startDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</schema:startDate> - <schema:endDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</schema:endDate> + <dcat:startDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</dcat:startDate> + <dcat:endDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</dcat:endDate> </dct:PeriodOfTime> </dct:temporal> </dcat:Dataset> @@ -329,8 +329,8 @@ <dcat:distribution rdf:resource="http://192.168.57.3:5000/dataset/7a3d797e-ff37-4e2e-b119-21d478cc142d/resource/9709b7b3-bf01-4fb5-a1e5-b7883276c261"/> <dct:temporal> <dct:PeriodOfTime rdf:nodeID="Ne889b672392a42279b517f5203785f38"> - <schema:endDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</schema:endDate> - <schema:startDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</schema:startDate> + <dcat:endDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</dcat:endDate> + <dcat:startDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</dcat:startDate> </dct:PeriodOfTime> </dct:temporal> </dcat:Dataset> @@ -348,8 +348,8 @@ <dct:issued rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</dct:issued> <dct:temporal> <dct:PeriodOfTime rdf:nodeID="N34e3b437cd144bae9dd4a75cd8472f24"> - <schema:endDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</schema:endDate> - <schema:startDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</schema:startDate> + <dcat:endDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</dcat:endDate> + <dcat:startDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</dcat:startDate> </dct:PeriodOfTime> </dct:temporal> <dct:publisher rdf:resource="http://192.168.57.3:5000/organization/61263ac6-64cd-4048-90fc-767ddf45f3b7"/> @@ -364,8 +364,8 @@ <dct:identifier>d83f6df1-04cf-4b86-98db-8585d7a6eef8</dct:identifier> <dct:temporal> <dct:PeriodOfTime rdf:nodeID="N71e9b81b9fbd424fadf7156be5a78dca"> - <schema:startDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</schema:startDate> - <schema:endDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</schema:endDate> + <dcat:startDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</dcat:startDate> + <dcat:endDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</dcat:endDate> </dct:PeriodOfTime> </dct:temporal> <dct:title>Test Title</dct:title> @@ -382,8 +382,8 @@ <dct:title>Test Title</dct:title> <dct:temporal> <dct:PeriodOfTime rdf:nodeID="Nf2ecbe446d0f416d8fd5cb807a07e723"> - <schema:startDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</schema:startDate> - <schema:endDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</schema:endDate> + <dcat:startDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</dcat:startDate> + <dcat:endDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</dcat:endDate> </dct:PeriodOfTime> </dct:temporal> <dcatde:contributorID rdf:resource="http://dcat-ap.de/def/contributors/schleswigHolstein"/> @@ -409,8 +409,8 @@ <dct:spatial rdf:resource="http://dcat-ap.de/def/politicalGeocoding/districtKey/01001"/> <dct:temporal> <dct:PeriodOfTime rdf:nodeID="Nab3be452bb4b43d0b55dcea8486dfa0c"> - <schema:startDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</schema:startDate> - <schema:endDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</schema:endDate> + <dcat:startDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</dcat:startDate> + <dcat:endDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</dcat:endDate> </dct:PeriodOfTime> </dct:temporal> </dcat:Dataset> @@ -429,8 +429,8 @@ <dct:identifier>8222314f-32ee-4148-9eb6-132cd800010d</dct:identifier> <dct:temporal> <dct:PeriodOfTime rdf:nodeID="N08a6632d6f6b4d95935a52969302325e"> - <schema:endDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</schema:endDate> - <schema:startDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</schema:startDate> + <dcat:endDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</dcat:endDate> + <dcat:startDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</dcat:startDate> </dct:PeriodOfTime> </dct:temporal> </dcat:Dataset> @@ -447,8 +447,8 @@ <dct:identifier>157b450d-829c-4865-9a5e-c0a154009d2e</dct:identifier> <dct:temporal> <dct:PeriodOfTime rdf:nodeID="Na664ef6fd6934ea894da79e17cb7055b"> - <schema:endDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</schema:endDate> - <schema:startDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</schema:startDate> + <dcat:endDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</dcat:endDate> + <dcat:startDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</dcat:startDate> </dct:PeriodOfTime> </dct:temporal> <dct:title>Test Title</dct:title> @@ -464,8 +464,8 @@ <dct:publisher rdf:resource="http://192.168.57.3:5000/organization/61263ac6-64cd-4048-90fc-767ddf45f3b7"/> <dct:temporal> <dct:PeriodOfTime rdf:nodeID="Ncff05b35e8094abf91684bb8fb707432"> - <schema:endDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</schema:endDate> - <schema:startDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</schema:startDate> + <dcat:endDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</dcat:endDate> + <dcat:startDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</dcat:startDate> </dct:PeriodOfTime> </dct:temporal> <dct:identifier>c58ce188-213a-420a-b600-a4f7b05dcabc</dct:identifier> @@ -480,8 +480,8 @@ <dct:description>Just another test dataset.</dct:description> <dct:temporal> <dct:PeriodOfTime rdf:nodeID="N6026595a5e8b47199eba2f738a5ad823"> - <schema:endDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</schema:endDate> - <schema:startDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</schema:startDate> + <dcat:endDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</dcat:endDate> + <dcat:startDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</dcat:startDate> </dct:PeriodOfTime> </dct:temporal> <dcat:distribution rdf:resource="http://192.168.57.3:5000/dataset/d54e16a0-4c9e-4763-8236-49d7d30f124b/resource/15790db8-d38f-49f5-8df7-06e17425f03d"/> @@ -509,8 +509,8 @@ <dcat:distribution rdf:resource="http://192.168.57.3:5000/dataset/d83e96cf-91eb-4131-9bea-2c33e547824c/resource/413d8fd2-45aa-434c-8ffc-1c6596c5b0aa"/> <dct:temporal> <dct:PeriodOfTime rdf:nodeID="Nc140db9118bc412e9028828f564be058"> - <schema:endDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</schema:endDate> - <schema:startDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</schema:startDate> + <dcat:endDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</dcat:endDate> + <dcat:startDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</dcat:startDate> </dct:PeriodOfTime> </dct:temporal> </dcat:Dataset> @@ -525,8 +525,8 @@ <dcat:distribution rdf:resource="http://192.168.57.3:5000/dataset/730dc759-1c92-47bd-8bce-9588db67cab0/resource/0147bdc6-1f20-4993-a9ac-11b6e7177e31"/> <dct:temporal> <dct:PeriodOfTime rdf:nodeID="N2d444a4835a145569e4e2ff49ff179a3"> - <schema:startDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</schema:startDate> - <schema:endDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</schema:endDate> + <dcat:startDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</dcat:startDate> + <dcat:endDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</dcat:endDate> </dct:PeriodOfTime> </dct:temporal> <dct:license rdf:resource="http://dcat-ap.de/def/licenses/dl-by-de/2.0"/> @@ -549,8 +549,8 @@ <dct:title>Test Title</dct:title> <dct:temporal> <dct:PeriodOfTime rdf:nodeID="Nf535e9f32436428c966717c95ac024d0"> - <schema:startDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</schema:startDate> - <schema:endDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</schema:endDate> + <dcat:startDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</dcat:startDate> + <dcat:endDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</dcat:endDate> </dct:PeriodOfTime> </dct:temporal> </dcat:Dataset> @@ -561,8 +561,8 @@ <dct:description>Just another test dataset.</dct:description> <dct:temporal> <dct:PeriodOfTime rdf:nodeID="Nbde2992aca9444e5b2ba0094fb32b178"> - <schema:startDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</schema:startDate> - <schema:endDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</schema:endDate> + <dcat:startDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</dcat:startDate> + <dcat:endDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</dcat:endDate> </dct:PeriodOfTime> </dct:temporal> <dct:title>Test Title</dct:title> @@ -583,8 +583,8 @@ <dct:modified rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2019-06-07T12:23:09.762685</dct:modified> <dct:temporal> <dct:PeriodOfTime rdf:nodeID="N3777cb90923641be842d5bab0907379a"> - <schema:endDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</schema:endDate> - <schema:startDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</schema:startDate> + <dcat:endDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</dcat:endDate> + <dcat:startDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</dcat:startDate> </dct:PeriodOfTime> </dct:temporal> <dct:identifier>ea0d8c57-7498-4ab7-b4df-a4a8c20451bd</dct:identifier> @@ -610,8 +610,8 @@ <dct:spatial rdf:resource="http://dcat-ap.de/def/politicalGeocoding/districtKey/01001"/> <dct:temporal> <dct:PeriodOfTime rdf:nodeID="Nb578a9c02498452db3f1168574e134de"> - <schema:endDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</schema:endDate> - <schema:startDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</schema:startDate> + <dcat:endDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</dcat:endDate> + <dcat:startDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</dcat:startDate> </dct:PeriodOfTime> </dct:temporal> </dcat:Dataset> @@ -621,8 +621,8 @@ <dct:description>Just another test dataset.</dct:description> <dct:temporal> <dct:PeriodOfTime rdf:nodeID="Na71adad42af4401eb447a032c6174e5e"> - <schema:endDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</schema:endDate> - <schema:startDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</schema:startDate> + <dcat:endDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</dcat:endDate> + <dcat:startDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</dcat:startDate> </dct:PeriodOfTime> </dct:temporal> <dct:title>Test Title</dct:title> @@ -646,8 +646,8 @@ <dcatde:contributorID rdf:resource="http://dcat-ap.de/def/contributors/schleswigHolstein"/> <dct:temporal> <dct:PeriodOfTime rdf:nodeID="N6d15d165bed74be1a81f98fe1e243d22"> - <schema:startDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</schema:startDate> - <schema:endDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</schema:endDate> + <dcat:startDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</dcat:startDate> + <dcat:endDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</dcat:endDate> </dct:PeriodOfTime> </dct:temporal> <dct:license rdf:resource="http://dcat-ap.de/def/licenses/dl-by-de/2.0"/> @@ -661,8 +661,8 @@ <dct:identifier>07a33216-9d1d-420a-be0a-45667f67ffeb</dct:identifier> <dct:temporal> <dct:PeriodOfTime rdf:nodeID="Ne81fbe4d091841418de9b66cfdf9c2d9"> - <schema:endDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</schema:endDate> - <schema:startDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</schema:startDate> + <dcat:endDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</dcat:endDate> + <dcat:startDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</dcat:startDate> </dct:PeriodOfTime> </dct:temporal> <dct:license rdf:resource="http://dcat-ap.de/def/licenses/dl-by-de/2.0"/> @@ -681,8 +681,8 @@ <dcat:distribution rdf:resource="http://192.168.57.3:5000/dataset/1e7ec9d5-0028-4ff6-b4d9-ded038eccb4a/resource/f8efcc67-938a-432d-a017-8a144378b234"/> <dct:temporal> <dct:PeriodOfTime rdf:nodeID="N4e7414a58c684a7dbe99ace41694312b"> - <schema:startDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</schema:startDate> - <schema:endDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</schema:endDate> + <dcat:startDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</dcat:startDate> + <dcat:endDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</dcat:endDate> </dct:PeriodOfTime> </dct:temporal> <dcat:distribution rdf:resource="http://192.168.57.3:5000/dataset/1e7ec9d5-0028-4ff6-b4d9-ded038eccb4a/resource/5785a16a-0fa0-4476-8973-32fa388d3927"/> @@ -707,8 +707,8 @@ <dct:issued rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</dct:issued> <dct:temporal> <dct:PeriodOfTime rdf:nodeID="N1c3ea4c8b3764b36b37aa63be48c8e76"> - <schema:startDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</schema:startDate> - <schema:endDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</schema:endDate> + <dcat:startDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</dcat:startDate> + <dcat:endDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</dcat:endDate> </dct:PeriodOfTime> </dct:temporal> <dcatde:contributorID rdf:resource="http://dcat-ap.de/def/contributors/schleswigHolstein"/> @@ -727,8 +727,8 @@ <dct:spatial rdf:resource="http://dcat-ap.de/def/politicalGeocoding/districtKey/01001"/> <dct:temporal> <dct:PeriodOfTime rdf:nodeID="N478fefe1c6e74ea8b2a3b8433103e8c8"> - <schema:startDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</schema:startDate> - <schema:endDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</schema:endDate> + <dcat:startDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</dcat:startDate> + <dcat:endDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</dcat:endDate> </dct:PeriodOfTime> </dct:temporal> <dct:issued rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</dct:issued> @@ -745,8 +745,8 @@ <dct:issued rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</dct:issued> <dct:temporal> <dct:PeriodOfTime rdf:nodeID="Nf4d81b4c90084661ab3d4362a171a635"> - <schema:endDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</schema:endDate> - <schema:startDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</schema:startDate> + <dcat:endDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</dcat:endDate> + <dcat:startDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</dcat:startDate> </dct:PeriodOfTime> </dct:temporal> <dcat:distribution rdf:resource="http://192.168.57.3:5000/dataset/fe349466-1f5b-40de-817f-39a4b0aaa066/resource/f80260a1-13e5-41c6-8844-f0e8f3d00a84"/> @@ -767,8 +767,8 @@ <dct:publisher rdf:resource="http://192.168.57.3:5000/organization/61263ac6-64cd-4048-90fc-767ddf45f3b7"/> <dct:temporal> <dct:PeriodOfTime rdf:nodeID="N70c02d4381e14a9e9d7194407eb1dbff"> - <schema:startDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</schema:startDate> - <schema:endDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</schema:endDate> + <dcat:startDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</dcat:startDate> + <dcat:endDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2000-01-27T00:00:00</dcat:endDate> </dct:PeriodOfTime> </dct:temporal> <dct:identifier>097f50ce-89d0-4e3e-93e1-5c20ae054c80</dct:identifier> diff --git a/ckanext/odsh/tests_wip/rdf_catalog_empty.xml b/ckanext/odsh/tests_wip/rdf_catalog_empty.xml index 7af9ac96ee981d5fbae560abe1858aede7e11eb7..5ce648587e9964e01cf0d5f1cabe8ee8883b841c 100644 --- a/ckanext/odsh/tests_wip/rdf_catalog_empty.xml +++ b/ckanext/odsh/tests_wip/rdf_catalog_empty.xml @@ -36,7 +36,7 @@ </dct:spatial> <dct:temporal> <dct:PeriodOfTime> - <schema:startDate rdf:datatype="http://www.w3.org/2001/XMLSchema#date">2018-10-12</schema:startDate> + <dcat:startDate rdf:datatype="http://www.w3.org/2001/XMLSchema#date">2018-10-12</dcat:startDate> </dct:PeriodOfTime> </dct:temporal> <dcat:keyword>Gehwege</dcat:keyword> diff --git a/ckanext/odsh/tests_wip/test_validation.py b/ckanext/odsh/tests_wip/test_validation.py index f2c4335393a58d4f49846a3df6c61da8eea46c99..c8913cf5833bc8060988e1c1b7c054b0fb6a176e 100644 --- a/ckanext/odsh/tests_wip/test_validation.py +++ b/ckanext/odsh/tests_wip/test_validation.py @@ -98,7 +98,7 @@ def test_validate_licenseAttributionByText(): def test_tag_name_validator_invalid(): with pytest.raises(Exception): - tag_name_validator('Foo\nBar', None) + tag_name_validator('', None) def test_tag_name_validator_valid(): diff --git a/ckanext/odsh/validation.py b/ckanext/odsh/validation.py index 2131bfa4947c96af61e82c6b1f09cbe12fa7fe99..b49d3629bf07b6da3a6cae3c19c47c986ca8c7c1 100644 --- a/ckanext/odsh/validation.py +++ b/ckanext/odsh/validation.py @@ -293,12 +293,16 @@ def validate_formats(data, errors): def tag_name_validator(value, context): - """Allow tag name to contain any characters but no newlines + """Validate tag name to ensure it is non-empty and contains no line breaks. + Replaces any newlines with spaces before validation. """ - tagname_match = re.compile(r'^(?=.*[^\n])[^\n]*$', re.UNICODE) - if not tagname_match.match(value): - raise toolkit.Invalid( - _('Invalid tag: "%s". Tags cannot contain line breaks.') % (value)) + # Replace all newlines (\n, \r) with spaces + value = re.sub(r'[\r\n]+', ' ', value).strip() + + # Ensure the tag is non-empty + if not value: + raise toolkit.Invalid(_('Invalid tag: Tags cannot be empty.')) + return value diff --git a/setup.py b/setup.py index a9f5931e1f5f5038320c79565c653bb108ea3915..acaf42743adb43394479661db940b2cafebc93c2 100755 --- a/setup.py +++ b/setup.py @@ -15,7 +15,7 @@ setup( # Versions should comply with PEP440. For a discussion on single-sourcing # the version across setup.py and the project code, see # http://packaging.python.org/en/latest/tutorial.html#version - version='2.4.4', + version='2.4.6', description='''A general extension for CKAN that is used for the Open Data Schleswig-Holstein project''', long_description=long_description,