citizenaspirant
/
PyBitmessage
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Fixed crash on sql query.

This commit is contained in:
Rainulf Pineda 2013-07-12 05:02:21 -04:00
parent 997a8ff13a
commit a3cdc28bbf
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/bitmessageqt/__init__.py
View File

@ -515,16 +515,17 @@ class MyForm(QtGui.QMainWindow):
sqlQuery = ''' sqlQuery = '''
SELECT toaddress, fromaddress, subject, message, status, ackdata, lastactiontime SELECT toaddress, fromaddress, subject, message, status, ackdata, lastactiontime
FROM sent WHERE folder="sent" AND %s LIKE "%s" FROM sent WHERE folder="sent" AND %s LIKE ?
ORDER BY lastactiontime ORDER BY lastactiontime
''' % (where, what) ''' % (where,)
while self.ui.tableWidgetSent.rowCount() > 0: while self.ui.tableWidgetSent.rowCount() > 0:
self.ui.tableWidgetSent.removeRow(0) self.ui.tableWidgetSent.removeRow(0)
t = (what,)
shared.sqlLock.acquire() shared.sqlLock.acquire()
shared.sqlSubmitQueue.put(sqlQuery) shared.sqlSubmitQueue.put(sqlQuery)
shared.sqlSubmitQueue.put('') shared.sqlSubmitQueue.put(t)
queryreturn = shared.sqlReturnQueue.get() queryreturn = shared.sqlReturnQueue.get()
shared.sqlLock.release() shared.sqlLock.release()
for row in queryreturn: for row in queryreturn:
@ -641,18 +642,19 @@ class MyForm(QtGui.QMainWindow):
sqlQuery = ''' sqlQuery = '''
SELECT msgid, toaddress, fromaddress, subject, received, message, read SELECT msgid, toaddress, fromaddress, subject, received, message, read
FROM inbox WHERE folder="inbox" AND %s LIKE "%s" FROM inbox WHERE folder="inbox" AND %s LIKE ?
ORDER BY received ORDER BY received
''' % (where, what) ''' % (where,)
while self.ui.tableWidgetInbox.rowCount() > 0: while self.ui.tableWidgetInbox.rowCount() > 0:
self.ui.tableWidgetInbox.removeRow(0) self.ui.tableWidgetInbox.removeRow(0)
font = QFont() font = QFont()
font.setBold(True) font.setBold(True)
t = (what,)
shared.sqlLock.acquire() shared.sqlLock.acquire()
shared.sqlSubmitQueue.put(sqlQuery) shared.sqlSubmitQueue.put(sqlQuery)
shared.sqlSubmitQueue.put('') shared.sqlSubmitQueue.put(t)
queryreturn = shared.sqlReturnQueue.get() queryreturn = shared.sqlReturnQueue.get()
shared.sqlLock.release() shared.sqlLock.release()
for row in queryreturn: for row in queryreturn: