From: Diane Trout <diane@caltech.edu>
Date: Thu, 30 Jun 2011 22:44:57 +0000 (-0700)
Subject: Older librdf gets cranky when mixing unicode & strings
X-Git-Tag: 0.5.2~5^2~1^2~1
X-Git-Url: http://woldlab.caltech.edu/gitweb/?p=htsworkflow.git;a=commitdiff_plain;h=f772713eb300050f339992d06414b0169762ebb2

Older librdf gets cranky when mixing unicode & strings
---

diff --git a/htsworkflow/submission/daf.py b/htsworkflow/submission/daf.py
index 28f7599..75c8868 100644
--- a/htsworkflow/submission/daf.py
+++ b/htsworkflow/submission/daf.py
@@ -260,7 +260,7 @@ class DAFMapper(object):
         submission_name = self.make_submission_name(submission_dir)
         submissionNode = self.get_submission_node(submission_dir)
         submission_uri = str(submissionNode.uri)
-        view_name = fromTypedNode(self.model.get_target(view, dafTermOntology['name']))
+        view_name = str(fromTypedNode(self.model.get_target(view, dafTermOntology['name'])))
         submissionView = RDF.Node(RDF.Uri(submission_uri + '/' + view_name))
 
         self.model.add_statement(
@@ -287,7 +287,7 @@ class DAFMapper(object):
 
         # Add everything I can find
         for term in terms:
-            value = self._get_library_attribute(libNode, term)
+            value = str(self._get_library_attribute(libNode, term))
             if value is not None:
                 self.model.add_statement(RDF.Statement(submissionView, term, value))