Merge branch 'master' into 32-camunda-reporting-input-format

diff --git a/camunda-overlay/camunda.py b/camunda-overlay/camunda.py
index 8ecaa0c027b984fad8798c7ddf6b35b6eb218d74..070603983bae43807ac62da0ee18417bda6da27a 100755 (executable)
--- a/camunda-overlay/camunda.py
+++ b/camunda-overlay/camunda.py
@@ -14,6 +14,13 @@ def get_current_deployments(key = 'sentiment-analysis'):
     #return [proc for proc in res.json() if proc['name'] == key]
     return res.json()
 
+def get_current_process_instances(key = 'sentiment-analysis'):
+    res = requests.get(CAMUNDA + 'process-instance')
+    if (key is None):
+        return res.json()
+    else:
+        return [instance for instance in res.json() if instance['definitionId'].startswith(key + ":")]
+
 def cleanup_old_deployments(key='sentiment-analysis'):
     print ("Cleaning up old deployments")
     for deployment in get_current_deployments(key):
@@ -77,6 +84,15 @@ def submit_terms(terms):
             except:
                 pprint(res.content)
 
+def download_pdf():
+    instances = get_current_process_instances()
+    instance = instances[0]['id']
+    res = requests.get(CAMUNDA + 'process-instance/' + instance + '/variables')
+    try:
+        pprint(res.json())
+    except:
+        pprint(res.content)
+
 if __name__ == "__main__":
     parser = argparse.ArgumentParser()
     parser.add_argument('--no-deploy', dest='deploy', default=True, action='store_false', help="Do not run the deployment step")
@@ -91,3 +107,6 @@ if __name__ == "__main__":
     if args.autoclick >= 1:
         # start clicking
         submit_terms(["voting", "phonegate", "35c3"])
+
+    if args.autoclick >= 2:
+        download_pdf()

diff --git a/camunda-overlay/sentiment-analysis.bpmn b/camunda-overlay/sentiment-analysis.bpmn
index 00637579c8db3ba092c477c344c0c8a71b83bbae..3a46c63a948612a2f2ac499f986d85e7e28c8dbf 100644 (file)
--- a/camunda-overlay/sentiment-analysis.bpmn
+++ b/camunda-overlay/sentiment-analysis.bpmn
@@ -35,7 +35,8 @@ var termStr = term.prop('term').value();
 //results.prop(termStr, analysis);
 // this is for list
 var item = {};
-item[termStr] = analysis;
+item["name"] = termStr;
+item["sentiment"] = analysis;
 results.append(item)
 
 execution.setVariable("results", S(results))</camunda:script>