From: Diane Trout <diane@caltech.edu>
Date: Wed, 14 Nov 2012 00:38:20 +0000 (-0800)
Subject: Merge branch 'master' of mus.cacr.caltech.edu:htsworkflow
X-Git-Url: http://woldlab.caltech.edu/gitweb/?p=htsworkflow.git;a=commitdiff_plain;h=ab3052aec5e16ebd3905ac297b958fb10a730f54;hp=abfa5301e72411867a9dc819c6ba02a0cb9e8d08

Merge branch 'master' of mus.cacr.caltech.edu:htsworkflow
---

diff --git a/htsworkflow/submission/submission.py b/htsworkflow/submission/submission.py
index c944b76..01bdb17 100644
--- a/htsworkflow/submission/submission.py
+++ b/htsworkflow/submission/submission.py
@@ -308,6 +308,9 @@ class Submission(object):
         query = RDF.SPARQLQuery(str(formatted_query))
         rdfstream = query.execute(self.model)
         results = []
-        for r in rdfstream:
-            results.append(r)
+        for record in rdfstream:
+            d = {}
+            for key, value in record.items():
+                d[key] = fromTypedNode(value)
+            results.append(d)
         return results
diff --git a/htsworkflow/util/rdfhelp.py b/htsworkflow/util/rdfhelp.py
index 6fa326d..e5c8718 100644
--- a/htsworkflow/util/rdfhelp.py
+++ b/htsworkflow/util/rdfhelp.py
@@ -119,8 +119,10 @@ def toTypedNode(value):
 def fromTypedNode(node):
     """Convert a typed RDF Node to its closest python equivalent
     """
-    if node is None:
-        return None
+    if not isinstance(node, RDF.Node):
+        return node
+    if node.is_resource():
+        return node
 
     value_type = get_node_type(node)
     literal = node.literal_value['string']