Make a validation error message between different ages of librdf.

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

diff --git a/htsworkflow/util/rdfinfer.py b/htsworkflow/util/rdfinfer.py
index aac3afa849178cecffa7f8185c29144f554ebe23..b36fe6293883a394ada8f005b37d78503acd79e2 100644 (file)
--- a/htsworkflow/util/rdfinfer.py
+++ b/htsworkflow/util/rdfinfer.py
@@ -143,7 +143,7 @@ class Infer(object):
         query = RDF.SPARQLQuery(body)
         errmsg = "Missing type for: {0}"
         for r in query.execute(self.model):
-            yield errmsg.format(str(r['subject']))
+            yield errmsg.format(str(r['subject'].uri))
 
     def _validate_undefined_properties(self):
         """Find properties that aren't defined.
@@ -187,13 +187,13 @@ class Infer(object):
             """
             # check domain
             query = RDF.SPARQLQuery(property_template.format(
-                predicate=predicate,
+                predicate=predicate.uri,
                 space=space))
             seen = []
             for r in query.execute(self.model):
                 if r['type'] == rdfsNS['Resource']:
                     continue
-                seen.append(str(r['type']))
+                seen.append(str(r['type'].uri))
                 check = RDF.Statement(node, rdfNS['type'], r['type'])
                 if self.model.contains_statement(check):
                     return