Changeset 7829 for branches/gajim_0.11/src/common/logger.py

Timestamp:

01/13/07 23:35:41 (23 months ago)

Author:

asterix

Message:

merge diff from trunc to 0.11 branch

Files:

• branches/gajim_0.11/src/common/logger.py (modified) (3 diffs)

branches/gajim_0.11/src/common/logger.py

@@ -426 +426 @@
                 self.cur.execute('''
                         SELECT time, kind, message FROM logs
-                        WHERE (%s) AND kind IN (%d, %d, %d, %d) AND time > %d
+                        WHERE (%s) AND kind IN (%d, %d, %d, %d, %d) AND time > %d
                         ORDER BY time DESC LIMIT %d OFFSET %d
-                        ''' % (where_sql, constants.KIND_SINGLE_MSG_RECV, constants.KIND_CHAT_MSG_RECV,
-                                constants.KIND_SINGLE_MSG_SENT, constants.KIND_CHAT_MSG_SENT,
+                        ''' % (where_sql, constants.KIND_SINGLE_MSG_RECV,
+                                constants.KIND_CHAT_MSG_RECV, constants.KIND_SINGLE_MSG_SENT,
+                                constants.KIND_CHAT_MSG_SENT, constants.KIND_ERROR,
                                 timed_out, restore_how_many_rows, pending_how_many)
                         )
@@ -516 +517 @@
                 result = self.cur.fetchall()
 
-                # Copy all interesant time in a temporary table 
+                # Copy all interesting times in a temporary table 
                 self.cur.execute('CREATE TEMPORARY TABLE blabla(time,INTEGER)') 
                 for line in result: 
@@ -555 +556 @@
                         where_sql = 'jid_id = %s' % jid_id      
                 self.cur.execute('''
-                        SELECT time FROM logs
+                        SELECT MAX(time) FROM logs
                         WHERE (%s) 
                         AND kind NOT IN (%d, %d)
-                        ORDER BY time DESC LIMIT 1
                         ''' % (where_sql, constants.KIND_STATUS, constants.KIND_GCSTATUS))