rdf:Resource can be either a resource or a blank node.

[htsworkflow.git] / htsworkflow / util / rdfinfer.py

diff --git a/htsworkflow/util/rdfinfer.py b/htsworkflow/util/rdfinfer.py
index aac3afa849178cecffa7f8185c29144f554ebe23..1a0fb504181cdf4aed6ebf2aadf68271efbb5bb1 100644 (file)
--- a/htsworkflow/util/rdfinfer.py
+++ b/htsworkflow/util/rdfinfer.py
@@ -8,6 +8,7 @@ from htsworkflow.util.rdfns import *
 from htsworkflow.util.rdfhelp import SCHEMAS_URL
 
 INFER_URL='http://jumpgate.caltech.edu/phony/infer'
+LOGGER = logging.getLogger(__name__)
 
 class Infer(object):
     """Provide some simple inference.
@@ -36,6 +37,7 @@ class Infer(object):
 
             for method_name in dir(self):
                 if method_name.startswith('_rule_'):
+                    LOGGER.info("Running: %s", method_name)
                     method = getattr(self, method_name)
                     method()
             if self.model.size() == starting_size:
@@ -55,6 +57,7 @@ class Infer(object):
         """
         for method_name in dir(self):
             if method_name.startswith('_validate_'):
+                LOGGER.info("Running: %s", method_name)
                 method = getattr(self, method_name)
                 for msg in method():
                     yield msg
@@ -185,15 +188,32 @@ class Infer(object):
             e.g. is a subject (node) the domain (space) of this property
             and is the object (node) the range of of this property.
             """
+            resource_error = "Expected resource for {0} in range {1}"
+            type_error = "Type of {0} was {1} not {2}"
             # check domain
             query = RDF.SPARQLQuery(property_template.format(
-                predicate=predicate,
+                predicate=predicate.uri,
                 space=space))
-            seen = []
+            seen = set()
             for r in query.execute(self.model):
+                # Make sure we have a resource if we're expecting one
                 if r['type'] == rdfsNS['Resource']:
+                    if node.is_literal():
+                        return resource_error.format(str(node), space)
                     continue
-                seen.append(str(r['type']))
+                seen.add(str(r['type'].uri))
+                if node.is_literal():
+                    # literal is a generic type.
+                    nodetype = node.literal_value['datatype']
+                    if nodetype is None:
+                        # lets default to string
+                        nodetype = xsdNS['string'].uri
+                    if r['type'] == rdfsNS['Literal']:
+                        pass
+                    elif nodetype != r['type'].uri:
+                        return type_error.format(
+                            str(node), nodetype, r['type'])
+                # check that node is the expetected class type
                 check = RDF.Statement(node, rdfNS['type'], r['type'])
                 if self.model.contains_statement(check):
                     return
@@ -221,5 +241,3 @@ class Infer(object):
                                    wrong_range_type.format(str(s)))
             if msg is not None: yield msg
         return
-
-