[llvm-commits] [zorg] r130507 - /zorg/trunk/lnt/lnt/server/ui/views.py

[Daniel Dunbar]

Author: ddunbar
Date: Fri Apr 29 10:26:11 2011
New Revision: 130507

URL: http://llvm.org/viewvc/llvm-project?rev=130507&view=rev
Log:
LNT/Flask: Fix a few bugs in the submit process.

Modified:
    zorg/trunk/lnt/lnt/server/ui/views.py

Modified: zorg/trunk/lnt/lnt/server/ui/views.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/lnt/lnt/server/ui/views.py?rev=130507&r1=130506&r2=130507&view=diff
==============================================================================
--- zorg/trunk/lnt/lnt/server/ui/views.py (original)
+++ zorg/trunk/lnt/lnt/server/ui/views.py Fri Apr 29 10:26:11 2011
@@ -90,14 +90,17 @@
         input_data = request.form.get('input_data')
         commit = int(request.form.get('commit', 0))
 
-        if not input_file.content_length and not input_data:
+	if input_file and not input_file.content_length:
+            input_file = None
+
+        if not input_file and not input_data:
             return render_template(
                 "submit_run.html", error="must provide input file or data")
-        if input_file.content_length and input_data:
+        if input_file and input_data:
             return render_template(
                 "submit_run.html", error="cannot provide input file *and* data")
 
-        if input_file.content_length:
+        if input_file:
             data_value = input_file.read()
         else:
             data_value = input_data
@@ -120,7 +123,7 @@
         result = ImportData.import_and_report(
             current_app.old_config, g.db_name, db, path, '<auto>', commit)
 
-        return flask.jsonify(data = result)
+        return flask.jsonify(**result)
 
     return render_template("submit_run.html")