Commit 34108fc3 authored by Vidjil Team's avatar Vidjil Team
Browse files

Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/vidjil/vidjil into rbx.vidjil.org

parents ad8b1ee3 ce19d964
...@@ -161,7 +161,10 @@ def get_analysis(): ...@@ -161,7 +161,10 @@ def get_analysis():
f = open('applications/vidjil/uploads/'+row.analysis_file, "r") f = open('applications/vidjil/uploads/'+row.analysis_file, "r")
analysis = gluon.contrib.simplejson.loads(f.read()) analysis = gluon.contrib.simplejson.loads(f.read())
f.close() f.close()
res["clusters"] = analysis["clusters"] if 'cluster' in analysis:
res["clusters"] = analysis["cluster"]
if 'clusters' in analysis :
res["clusters"] = analysis["clusters"]
res["clones"] = analysis["clones"] res["clones"] = analysis["clones"]
res["tags"] = analysis["tags"] res["tags"] = analysis["tags"]
res["samples"]= analysis["samples"] res["samples"]= analysis["samples"]
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment