libtransport.git Changeset - ebebf04f69f1

Changeset - ebebf04f69f1

Parent rev.

Child rev.

[Not reviewed]

0 3 0

Jan Kaluza - 15 years ago 2011-04-07 14:21:42
hanzz.k@gmail.com

SQLite3Backend::addBuddy

3 files changed with 36 insertions and 1 deletions:

include/transport/sqlite3backend.h

src/rostermanager.cpp

src/sqlite3backend.cpp

0 comments (0 inline, 0 general)

include/transport/sqlite3backend.h

➞

Show inline comments

@@ @@ -76,13 +76,14 @@ class SQLite3Backend : public StorageBackend @@
 		/// Returns JIDs of all buddies in user's roster.
 		/// \param id id of user - UserInfo.id
 		/// \param roster string list used to store user's roster
 		/// \return true if user has been found in database and roster has been fetched
 		bool getBuddies(long id, std::list<std::string> &roster);
 		long addBuddy(long userId, const BuddyInfo &buddyInfo) { return 0; }
 		long addBuddy(long userId, const BuddyInfo &buddyInfo);
 		void updateBuddy(long userId, const BuddyInfo &buddyInfo) {}
 		void removeBuddy(long id) {}
 		void beginTransaction() {}
 		void commitTransaction() {}
@@ @@ -97,9 +98,10 @@ class SQLite3Backend : public StorageBackend @@
 		sqlite3_stmt *m_setUser;
 		sqlite3_stmt *m_getUser;
 		sqlite3_stmt *m_removeUser;
 		sqlite3_stmt *m_removeUserBuddies;
 		sqlite3_stmt *m_removeUserSettings;
 		sqlite3_stmt *m_removeUserBuddiesSettings;
 		sqlite3_stmt *m_addBuddy;
 };
+}

src/rostermanager.cpp

➞

Show inline comments

@@ @@ -85,12 +85,15 @@ void RosterManager::setBuddyCallback(Buddy *buddy) { @@
 	if (m_setBuddyTimer->onTick.empty()) {
 		m_setBuddyTimer->stop();
 		if (true /*&& rie_is_supported*/) {
 			m_RIETimer->start();
+		}
+	}
 	if (m_rosterStorage)
 		m_rosterStorage->storeBuddy(buddy);
+}
 void RosterManager::unsetBuddy(Buddy *buddy) {
 	m_buddies.erase(buddy->getName());
 	if (m_rosterStorage)
 		m_rosterStorage->removeBuddyFromQueue(buddy);

src/sqlite3backend.cpp

➞

Show inline comments

@@ @@ -38,12 +38,21 @@ @@
 // Finalize the prepared statement
 #define FINALIZE_STMT(prep) \
 	if(prep != NULL) { \
 		sqlite3_finalize(prep); \
+	}
 #define BEGIN(STATEMENT) 	sqlite3_reset(m_addBuddy);\
 							int STATEMENT##_id = 1;
 #define BIND_INT(STATEMENT, VARIABLE) sqlite3_bind_int(STATEMENT, STATEMENT##_id++, VARIABLE);
 #define BIND_STR(STATEMENT, VARIABLE) sqlite3_bind_text(STATEMENT, STATEMENT##_id++, VARIABLE.c_str(), -1, SQLITE_STATIC);
 #define EXECUTE_STATEMENT(STATEMENT, NAME) 	if(sqlite3_step(STATEMENT) != SQLITE_DONE) {\
 		onStorageError(NAME, (sqlite3_errmsg(m_db) == NULL ? "" : sqlite3_errmsg(m_db)));\
+			}
 using namespace boost;
 namespace Transport {
 SQLite3Backend::SQLite3Backend(Config *config) {
 	m_config = config;
@@ @@ -81,12 +90,14 @@ bool SQLite3Backend::connect() { @@
 	PREP_STMT(m_removeUser, "DELETE FROM " + m_prefix + "users WHERE id=?");
 	PREP_STMT(m_removeUserBuddies, "DELETE FROM " + m_prefix + "buddies WHERE user_id=?");
 	PREP_STMT(m_removeUserSettings, "DELETE FROM " + m_prefix + "users_settings WHERE user_id=?");
 	PREP_STMT(m_removeUserBuddiesSettings, "DELETE FROM " + m_prefix + "buddies_settings WHERE user_id=?");
 	PREP_STMT(m_addBuddy, "INSERT INTO " + m_prefix + "buddies (user_id, uin, subscription, groups, nickname, flags) VALUES (?, ?, ?, ?, ?, ?)");
 	return true;
+}
 bool SQLite3Backend::createDatabase() {
 	int not_exist = exec("CREATE TABLE " + m_prefix + "buddies ("
 				"  id INTEGER PRIMARY KEY NOT NULL,"
+}
 void SQLite3Backend::setUserOnline(long id, bool online) {
+}
 long SQLite3Backend::addBuddy(long userId, const BuddyInfo &buddyInfo) {
 // 	"INSERT INTO " + m_prefix + "buddies (user_id, uin, subscription, groups, nickname, flags) VALUES (?, ?, ?, ?, ?, ?)"
 	BEGIN(m_addBuddy);
 	BIND_INT(m_addBuddy, userId);
 	BIND_STR(m_addBuddy, buddyInfo.legacyName);
 	BIND_STR(m_addBuddy, buddyInfo.subscription);
 	BIND_STR(m_addBuddy, buddyInfo.groups[0]); // TODO: serialize groups
 	BIND_STR(m_addBuddy, buddyInfo.alias);
 	BIND_INT(m_addBuddy, buddyInfo.flags);
 	EXECUTE_STATEMENT(m_addBuddy, "addBuddy query");
 	if(sqlite3_step(m_addBuddy) != SQLITE_DONE) {
 		onStorageError("addBuddy query", (sqlite3_errmsg(m_db) == NULL ? "" : sqlite3_errmsg(m_db)));
 		return -1;
+	}
 	return (long) sqlite3_last_insert_rowid(m_db);
+}
 bool SQLite3Backend::getBuddies(long id, std::list<std::string> &roster) {
 	return true;
+}
 bool SQLite3Backend::removeUser(long id) {
 	sqlite3_reset(m_removeUser);

0 comments (0 inline, 0 general)