Merge pull request #378 from ckan/fix-dcat-ap-3-version

Fix: use DCAT.version on DCAT AP v3

Author: amercader

ckanext/dcat/profiles/euro_dcat_ap_3.py

@@ -6,6 +6,7 @@
     SKOS,
     ADMS,
     RDF,
+    OWL,
 )
 
 from .base import URIRefOrLiteral
@@ -31,6 +32,18 @@ def parse_dataset(self, dataset_dict, dataset_ref):
         dataset_dict = self._parse_dataset_v2_scheming(dataset_dict, dataset_ref)
 
         # DCAT AP v3: hasVersion
+        dataset_dict = self._parse_dataset_v3(dataset_dict, dataset_ref)
+
+        return dataset_dict
+
+    def _parse_dataset_v3(self, dataset_dict, dataset_ref):
+
+        # version
+        value = self._object_value(dataset_ref, DCAT.version)
+        if value:
+            dataset_dict["version"] = value
+
+        # hasVersion
         values = self._object_value_list(dataset_ref, DCAT.hasVersion)
         if values:
             dataset_dict["has_version"] = values
@@ -51,12 +64,6 @@ def graph_from_dataset(self, dataset_dict, dataset_ref):
         # DCAT AP v3 properties also applied to higher versions
         self._graph_from_dataset_v3(dataset_dict, dataset_ref)
 
-        # DCAT AP v3: List triples
-        items = [
-            ("has_version", DCAT.hasVersion, None, URIRefOrLiteral),
-        ]
-        self._add_list_triples_from_dict(dataset_dict, dataset_ref, items)
-
     def graph_from_catalog(self, catalog_dict, catalog_ref):
 
         self._graph_from_catalog_base(catalog_dict, catalog_ref)
@@ -71,6 +78,22 @@ def _graph_from_dataset_v3(self, dataset_dict, dataset_ref):
             self.g.remove((dataset_ref, RDF.type, None))
             self.g.add((dataset_ref, RDF.type, DCAT.DatasetSeries))
 
+        # version own:versionInfo -> dcat:version
+        self.g.remove((dataset_ref, OWL.versionInfo, None))
+        self._add_triple_from_dict(
+            dataset_dict,
+            dataset_ref,
+            DCAT.version,
+            "version",
+            _type=Literal,
+        )
+
+        # hasVersion
+        items = [
+            ("has_version", DCAT.hasVersion, None, URIRefOrLiteral),
+        ]
+        self._add_list_triples_from_dict(dataset_dict, dataset_ref, items)
+
         # byteSize decimal -> nonNegativeInteger
         for subject, predicate, object in self.g.triples((None, DCAT.byteSize, None)):
             if object and object.datatype == XSD.decimal:

ckanext/dcat/tests/profiles/dcat_ap_3/test_euro_dcatap_3_profile_serialize.py

@@ -68,7 +68,7 @@ def test_e2e_ckan_to_dcat(self):
         assert self._triple(g, dataset_ref, RDF.type, DCAT.Dataset)
         assert self._triple(g, dataset_ref, DCT.title, dataset["title"])
         assert self._triple(g, dataset_ref, DCT.description, dataset["notes"])
-        assert self._triple(g, dataset_ref, OWL.versionInfo, dataset["version"])
+        assert self._triple(g, dataset_ref, DCAT.version, dataset["version"])
 
         # Standard fields
         assert self._triple(g, dataset_ref, DCT.identifier, dataset["identifier"])

ckanext/dcat/tests/profiles/dcat_us_3/test_dcat_us_3_profile_serialize.py

@@ -69,7 +69,7 @@ def test_e2e_ckan_to_dcat(self):
         assert self._triple(g, dataset_ref, RDF.type, DCAT.Dataset)
         assert self._triple(g, dataset_ref, DCT.title, dataset["title"])
         assert self._triple(g, dataset_ref, DCT.description, dataset["notes"])
-        assert self._triple(g, dataset_ref, OWL.versionInfo, dataset["version"])
+        assert self._triple(g, dataset_ref, DCAT.version, dataset["version"])
 
         # Standard fields
         assert self._triple(g, dataset_ref, DCT.identifier, dataset["identifier"])