projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ChatMonitorSettingspage ported to 0.3.x
[quassel.git]
/
src
/
core
/
sqlitestorage.cpp
diff --git
a/src/core/sqlitestorage.cpp
b/src/core/sqlitestorage.cpp
index
0d870a6
..
79ccd27
100644
(file)
--- a/
src/core/sqlitestorage.cpp
+++ b/
src/core/sqlitestorage.cpp
@@
-728,7
+728,7
@@
QList<Message> SqliteStorage::requestMsgs(UserId user, BufferId bufferId, MsgId
return messagelist;
}
return messagelist;
}
-QList<Message> SqliteStorage::requestAll
NewMsgs(UserId user, int fir
st, int limit) {
+QList<Message> SqliteStorage::requestAll
Msgs(UserId user, MsgId first, MsgId la
st, int limit) {
QList<Message> messagelist;
QHash<BufferId, BufferInfo> bufferInfoHash;
QList<Message> messagelist;
QHash<BufferId, BufferInfo> bufferInfoHash;
@@
-737,17
+737,22
@@
QList<Message> SqliteStorage::requestAllNewMsgs(UserId user, int first, int limi
}
QSqlQuery query(logDb());
}
QSqlQuery query(logDb());
- query.prepare(queryString("select_messagesAllNew"));
+ if(last == -1) {
+ query.prepare(queryString("select_messagesAllNew"));
+ } else {
+ query.prepare(queryString("select_messagesAll"));
+ query.bindValue(":lastmsg", last.toInt());
+ }
query.bindValue(":userid", user.toInt());
query.bindValue(":userid", user.toInt());
- query.bindValue(":firstmsg", first);
+ query.bindValue(":firstmsg", first
.toInt()
);
query.bindValue(":limit", limit);
safeExec(query);
watchQuery(query);
while(query.next()) {
query.bindValue(":limit", limit);
safeExec(query);
watchQuery(query);
while(query.next()) {
- Message msg(QDateTime::fromTime_t(query.value(
1
).toInt()),
- bufferInfoHash[query.value(
2
).toInt()],
+ Message msg(QDateTime::fromTime_t(query.value(
2
).toInt()),
+ bufferInfoHash[query.value(
1
).toInt()],
(Message::Type)query.value(3).toUInt(),
query.value(6).toString(),
query.value(5).toString(),
(Message::Type)query.value(3).toUInt(),
query.value(6).toString(),
query.value(5).toString(),