changed result code and server

green-cabbage · May 2, 2017 · b1c2877 · b1c2877
1 parent fbbe157
commit b1c2877
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 20 deletions.
diff --git a/server.py b/server.py
@@ -71,7 +71,12 @@ def upload_file():
             print(bulkdata)
             retData=flipFlopped(bulkdata)
             print(retData)
-            result =  {"# of fllipflops" : 1212, "# of consistencies":12321}
+            result = {}
+            for i in retData:
+                for j in range(len(i[1])):
+                    result[i[0]+"flipflop #"+j]= i[1][j]
+                for j in range(len(i[2])):
+                    result[i[0]+"consistent #"+j]=i[2][j]
             return render_template("result.html",result = result)
             # first cut file lenghts down  the concat them
 

diff --git a/templates/result.html b/templates/result.html
@@ -44,27 +44,15 @@ <h2> Results </h2>
 
       </center>
 
-          <table style="background-color:rgba(0,0,0,0.15)" border = 1>
-            {% for (int i=0; i<result.length;i++) %}
-
-              <tr>
-                <th> {{ "sentence"  }} </th>
-                <td> {{ result[i][0] }} </td>
-                {% for (int j=0; j< result[i][1].length;j++) %}
-                  <th> {{ "fllipflops"  }} </th>
-                  <td> {{ result[i][1][j] }} </td>
-                  {% endfor %}
-                  {% for (int k=0; k< result[i][2].length ; k++) %}
-                  <th> {{ "consistencies"}} </th>
-                  <td> {{ result[i][2][k] }} </td>
-                {% endfor %}
-
-            </tr>
-            {% endfor %}
-
-
+      <table style="background-color:rgba(0,0,0,0.15)" border = 1>
+        {% for key, value in result.items() %}
 
+        <tr>
+           <th> {{ key }} </th>
+           <td> {{ value }} </td>
+        </tr>
 
+     {% endfor %}
 
       </table>