Update mapping and ontologies.

- Fix test that counts type relationsships for dataset
- fix marshal ontology prefix

test/test_queries.py

@@ -98,7 +98,8 @@ def test_dataset_type_relations(self):
         response = graph.query(query_string)
 
         self.assertEqual(len(response), 1)
-        self.assertEqual(int([r.n_types for r in response][0]), 1)
+
+        self.assertEqual(int([r.n_types for r in response][0]), 2)
 
     def test_dataset_type_value(self):
         """ A ome_core:Dataset instance must be of type ome_core:Dataset (issue #5)."""
@@ -187,7 +188,7 @@ def test_dataset_marshal(self):
 
         query_string = f"""
         prefix ome_core: <http://www.openmicroscopy.org/rdf/2016-06/ome_core/>
-        prefix ome_marshal: <http://www.openmicroscopy.org/Schema/OME/2015-01/>
+        prefix ome_marshal: <http://www.openmicroscopy.org/Schemas/OME/2015-01/>
 
         SELECT distinct ?ds WHERE {{
           SERVICE <{ENDPOINT}> {{

test_infra_ontop/catalog-v001.xml

@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <catalog prefer="public" xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
-    <uri id="Imports Wizard Entry" name="http://www.openmicroscopy.org/rdf/2016-06/ome_core/" uri="https://raw.githubusercontent.com/German-BioImaging/ome-owl/refs/heads/main/ontology/owl/ome_core/ome_core.owl.ttl"/>
-    <uri id="Imports Wizard Entry" name="http://www.openmicroscopy.org/rdf/2016-06/ome_core/" uri="file:/home/grotec/Repositories/omero-ontop-mappings/ome-owl/ontology/owl/ome_core/ome_core.owl.ttl"/>
     <uri id="Imports Wizard Entry" name="http://www.openmicroscopy.org/rdf/2016-06/ome_core/" uri="https://raw.githubusercontent.com/German-BioImaging/ome-owl/refs/heads/ome-owl_for_ontop/ontology/owl/ome_core/ome_core.owl.ttl"/>
     <group id="Folder Repository, directory=, recursive=true, Auto-Update=true, version=2" prefer="public" xml:base=""/>
 </catalog>

test_infra_ontop/omemap.ttl

@@ -62,12 +62,12 @@ ome_core:tagAnnotationValue rdf:type owl:DatatypeProperty .
 
 ###  http://www.openmicroscopy.org/Schemas/OME/2015-01/Dataset
 ome_marshal:Dataset rdf:type owl:Class ;
-                    owl:equivalentClass ome_core:Dataset .
+    owl:equivalentClass ome_core:Dataset .
 
 
 ###  http://www.openmicroscopy.org/rdf/2016-06/ome_core/Dataset
 ome_core:Dataset owl:disjointWith ome_core:Image ;
-                 rdfs:isDefinedBy ome_marshal:Dataset .
+    rdfs:isDefinedBy ome_marshal:Dataset .
 
 
 ###  http://www.openmicroscopy.org/rdf/2016-06/ome_core/Folder