Bugfix makerdf (helper function for converting to RDF).

Author: Peter Amstutz

schema_salad/jsonld_context.py

@@ -188,7 +188,7 @@ def fix_jsonld_ids(obj, ids):
         for entry in obj:
             fix_jsonld_ids(entry, ids)
 
-def makerdf(workflow, wf, ctx):
+def makerdf(workflow, wf, ctx, graph=None):
     # type: (Union[str, unicode], Union[List[Dict[unicode, Any]], Dict[unicode, Any]], Loader.ContextType) -> Graph
     prefixes = {}
     idfields = []
@@ -201,20 +201,23 @@ def makerdf(workflow, wf, ctx):
             idfields.append(k)
         doc_url, frg = urlparse.urldefrag(url)
         if "/" in frg:
-            p, _ = frg.split("/")
+            p = frg.split("/")[0]
             prefixes[p] = u"%s#%s/" % (doc_url, p)
 
+    fix_jsonld_ids(wf, idfields)
+
+    if graph is None:
+        g = Graph()
+    else:
+        g = graph
+
     if isinstance(wf, list):
-        wf = {
-            "@context": ctx,
-            "@graph": wf
-        }
+        for w in wf:
+            w["@context"] = ctx
+            g.parse(data=json.dumps(w), format='json-ld', location=workflow)
     else:
         wf["@context"] = ctx
-
-    fix_jsonld_ids(wf, idfields)
-
-    g = Graph().parse(data=json.dumps(wf), format='json-ld', location=workflow)
+        g.parse(data=json.dumps(wf), format='json-ld', location=workflow)
 
     # Bug in json-ld loader causes @id fields to be added to the graph
     for s,p,o in g.triples((None, URIRef("@id"), None)):

setup.py

@@ -41,7 +41,7 @@
 extras_require = {}               # TODO: to be removed when the above is added
 
 setup(name='schema-salad',
-      version='1.14',
+      version='1.15',
       description='Schema Annotations for Linked Avro Data (SALAD)',
       long_description=open(README).read(),
       author='Common workflow language working group',