minor refactoring - #297

bdamele · bdamele · commit e439c3d3f556 · 2013-02-06T17:09:43.000Z
diff --git a/lib/utils/api.py b/lib/utils/api.py
@@ -75,6 +75,9 @@ def disconnect(self):
         self.cursor.close()
         self.connection.close()
 
+    def commit(self):
+        self.cursor.commit()
+
     def execute(self, statement, arguments=None):
         if arguments:
             self.cursor.execute(statement, arguments)
@@ -186,6 +189,10 @@ def write(self, value, status=CONTENT_STATUS.IN_PROGRESS, content_type=None):
             output = conf.database_cursor.execute("SELECT id, value FROM data WHERE taskid = ? AND status = ? AND content_type = ? LIMIT 0,1",
                                                   (self.taskid, status, content_type))
 
+            # Delete partial output from IPC database if we have got a complete output
+            if status == CONTENT_STATUS.COMPLETE and len(output) > 0:
+                conf.database_cursor.execute("DELETE FROM data WHERE id=?", (output[0][0],))
+
             if status == CONTENT_STATUS.IN_PROGRESS:
                 if len(output) == 0:
                     conf.database_cursor.execute("INSERT INTO data VALUES(NULL, ?, ?, ?, ?)",
@@ -195,10 +202,6 @@ def write(self, value, status=CONTENT_STATUS.IN_PROGRESS, content_type=None):
                     conf.database_cursor.execute("UPDATE data SET value = ? WHERE id = ?",
                                                  (jsonize(new_value), output[0][0]))
             else:
-                if len(output) > 0:
-                    conf.database_cursor.execute("DELETE FROM data WHERE taskid = ? AND status = %s AND content_type = ?" % CONTENT_STATUS.IN_PROGRESS,
-                                                 (self.taskid, content_type))
-
                 conf.database_cursor.execute("INSERT INTO data VALUES(NULL, ?, ?, ?, ?)",
                                              (self.taskid, status, content_type, jsonize(value)))
         else:
