QSqlQuery insertServersQuery(logDb());
insertServersQuery.prepare(queryString("insert_server"));
- foreach(QVariant server_, info.serverList) {
- QVariantMap server = server_.toMap();
- insertServersQuery.bindValue(":hostname", server["Host"]);
- insertServersQuery.bindValue(":port", server["Port"].toInt());
- insertServersQuery.bindValue(":password", server["Password"]);
- insertServersQuery.bindValue(":ssl", server["UseSSL"].toBool() ? 1 : 0);
+ foreach(Network::Server server, info.serverList) {
+ insertServersQuery.bindValue(":hostname", server.host);
+ insertServersQuery.bindValue(":port", server.port);
+ insertServersQuery.bindValue(":password", server.password);
+ insertServersQuery.bindValue(":ssl", server.useSsl ? 1 : 0);
insertServersQuery.bindValue(":userid", user.toInt());
insertServersQuery.bindValue(":networkid", info.networkId.toInt());
if(!watchQuery(serversQuery))
return nets;
- QVariantList servers;
+ Network::ServerList servers;
while(serversQuery.next()) {
- QVariantMap server;
- server["Host"] = serversQuery.value(0).toString();
- server["Port"] = serversQuery.value(1).toInt();
- server["Password"] = serversQuery.value(2).toString();
- server["UseSSL"] = serversQuery.value(3).toInt() == 1 ? true : false;
+ Network::Server server;
+ server.host = serversQuery.value(0).toString();
+ server.port = serversQuery.value(1).toUInt();
+ server.password = serversQuery.value(2).toString();
+ server.useSsl = serversQuery.value(3).toInt() == 1 ? true : false;
servers << server;
}
net.serverList = servers;
return messagelist;
}
-QList<Message> SqliteStorage::requestAllNewMsgs(UserId user, int first, int limit) {
+QList<Message> SqliteStorage::requestAllMsgs(UserId user, MsgId first, MsgId last, int limit) {
QList<Message> messagelist;
QHash<BufferId, BufferInfo> bufferInfoHash;
}
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(":firstmsg", first);
+ query.bindValue(":firstmsg", first.toInt());
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(),