Merge pull request #72 from roocs/fix-json-parameter

added workaround for cdata issue

rook/processes/wps_orchestrate.py

@@ -6,6 +6,9 @@
 
 from rook import workflow
 
+import logging
+LOGGER = logging.getLogger()
+
 
 class Orchestrate(Process):
     def __init__(self):
@@ -47,9 +50,13 @@ def __init__(self):
 
     def _handler(self, request, response):
         try:
+            wfdata = request.inputs['workflow'][0].data
+            # workaround for CDATA issue in pywps
+            wfdata = wfdata.replace("<![CDATA[", "").replace("]]>", "")
+            LOGGER.debug(f"wfdata={wfdata}")
             wf = workflow.WorkflowRunner(
                 output_dir=self.workdir)
-            output = wf.run(request.inputs['workflow'][0].file)
+            output = wf.run(wfdata)
         except Exception as e:
             raise ProcessError(f"{e}")
         # metalink document with collection of netcdf files

rook/workflow.py

@@ -1,3 +1,4 @@
+import os
 import yaml
 from copy import deepcopy
 import networkx as nx
@@ -10,8 +11,11 @@
 LOGGER = logging.getLogger()
 
 
-def load_wfdoc(path):
-    wfdoc = yaml.load(open(path, "rb"))
+def load_wfdoc(data):
+    if os.path.isfile(data):
+        wfdoc = yaml.load(open(data, "rb"))
+    else:
+        wfdoc = yaml.load(data)
     return wfdoc