Merge pull request #731 from satra/fix/prov

Fix/prov

Author: satra

nipype/external/provcopy.py

@@ -21,7 +21,7 @@
     from rdflib.term import URIRef, BNode
     from rdflib.term import Literal as RDFLiteral
     from rdflib.graph import ConjunctiveGraph, Graph
-    from rdflib.namespace import RDF
+    from rdflib.namespace import RDF, RDFS
 except ImportError:
     pass
 
@@ -760,7 +760,12 @@ def rdf(self, graph=None, subj=None):
                 graph.add((subj, pred, obj))
         if self._extra_attributes:
             for (attr, value) in self._extra_attributes:
-                pred = attr.rdf_representation() if attr != PROV['type'] else RDF.type
+                if attr == PROV['type']:
+                    pred = RDF.type
+                elif attr == PROV['label']:
+                    pred = RDFS.label
+                else:
+                    pred = attr.rdf_representation()
                 try:
                     # try if there is a RDF representation defined
                     obj = value.rdf_representation()
@@ -825,7 +830,12 @@ def rdf(self, graph=None):
             for (attr, value) in self._extra_attributes:
                 if not value:
                     continue
-                pred = attr.rdf_representation() if attr != PROV['type'] else RDF.type
+                if attr == PROV['type']:
+                    pred = RDF.type
+                elif attr == PROV['label']:
+                    pred = RDFS.label
+                else:
+                    pred = attr.rdf_representation()
                 try:
                     # try if there is a RDF representation defined
                     otherobj = value.rdf_representation()

nipype/utils/provenance.py

@@ -241,7 +241,7 @@ def add_results(self, results):
                 continue
             in_attr = {pm.PROV["label"]: key,
                        nipype_ns["environment_variable"]: key,
-                       nipype_ns["value"]: safe_encode(val)}
+                       pm.PROV["value"]: safe_encode(val)}
             id = get_attr_id(in_attr)
             self.g.entity(id, in_attr)
             self.g.hadMember(env_collection, id)
@@ -257,7 +257,7 @@ def add_results(self, results):
             for idx, (key, val) in enumerate(sorted(inputs.items())):
                 in_attr = {pm.PROV["label"]: key,
                            nipype_ns["in_port"]: key,
-                           nipype_ns["value"]: safe_encode(val)}
+                           pm.PROV["value"]: safe_encode(val)}
                 id = get_attr_id(in_attr)
                 self.g.entity(id, in_attr)
                 self.g.hadMember(input_collection, id)
@@ -276,7 +276,7 @@ def add_results(self, results):
             for idx, (key, val) in enumerate(sorted(outputs.items())):
                 out_attr = {pm.PROV["label"]: key,
                             nipype_ns["out_port"]: key,
-                            nipype_ns["value"]: safe_encode(val)}
+                            pm.PROV["value"]: safe_encode(val)}
                 id = get_attr_id(out_attr)
                 self.g.entity(id, out_attr)
                 self.g.hadMember(output_collection, id)