libtransport.git Changeset - faeb4bd8ef6b

Changeset - faeb4bd8ef6b

Parent rev.

Child rev.

[Not reviewed]

0 1 0

Daniel Henninger - 13 years ago 2012-02-19 09:10:35
daniel@vorpalcloud.org

One more function to go after this. At some future date I'd like to consider if the API provides some better mechanisms, but this'll do for now.

1 file changed with 55 insertions and 63 deletions:

src/pqxxbackend.cpp

0 comments (0 inline, 0 general)

src/pqxxbackend.cpp

➞

Show inline comments

+}
 bool PQXXBackend::getBuddies(long id, std::list<BuddyInfo> &roster) {
 //	SELECT id, uin, subscription, nickname, groups, flags FROM " + m_prefix + "buddies WHERE user_id=? ORDER BY id ASC
 //	*m_getBuddies << id;
 // 	"SELECT buddy_id, type, var, value FROM " + m_prefix + "buddies_settings WHERE user_id=? ORDER BY buddy_id ASC"
 //	*m_getBuddiesSettings << id;
 	try {
 		pqxx::work txn(*m_conn);
 //	SettingVariableInfo var;
 //	long buddy_id = -1;
 //	std::string key;
 		pqxx::result r = txn.exec("SELECT id, uin, subscription, nickname, groups, flags FROM " + m_prefix + "buddies WHERE user_id=" + pqxx::to_string(id) + " ORDER BY id ASC");
 		for (pqxx::result::const_iterator it = r.begin(); it != r.end(); it++)  {
 			BuddyInfo b;
 			std::string group;
 //	EXEC(m_getBuddies, getBuddies(id, roster));
 //	if (!exec_ok)
 //		return false;
 			b.id = r[0][0].as<long>();
 			b.legacyName = r[0][1].as<std::string>();
 			b.subscription = r[0][2].as<std::string>();
 			b.alias = r[0][3].as<std::string>();
 			group = r[0][4].as<std::string>();
 			b.flags = r[0][5].as<long>();
 //	while (m_getBuddies->fetch() == 0) {
 //		BuddyInfo b;
 			if (!group.empty()) {
 				b.groups = Util::deserializeGroups(group);
+			}
 //		std::string group;
 //		*m_getBuddies >> b.id >> b.legacyName >> b.subscription >> b.alias >> group >> b.flags;
 			roster.push_back(b);
+		}
 //		if (!group.empty()) {
 //			b.groups = Util::deserializeGroups(group);
 //		}
 //		roster.push_back(b);
 //	}
 		r = txn.exec("SELECT buddy_id, type, var, value FROM " + m_prefix + "buddies_settings WHERE user_id=" + pqxx::to_string(id) + " ORDER BY buddy_id ASC");
 		for (pqxx::result::const_iterator it = r.begin(); it != r.end(); it++)  {
 			SettingVariableInfo var;
 			long buddy_id = -1;
 			std::string key;
 			std::string val;
 			buddy_id = r[0][0].as<long>();
 			var.type = r[0][1].as<long>();
 			key = r[0][2].as<std::string>();
 			val = r[0][3].as<std::string>();
 			switch (var.type) {
 				case TYPE_BOOLEAN:
 					var.b = atoi(val.c_str());
 					break;
 				case TYPE_STRING:
 					var.s = val;
 					break;
 				default:
 					continue;
 					break;
+			}
 			BOOST_FOREACH(BuddyInfo &b, roster) {
 				if (buddy_id == b.id) {
 					b.settings[key] = var;
 					break;
+				}
+			}
+		}
 //	EXEC(m_getBuddiesSettings, getBuddies(id, roster));
 //	if (!exec_ok)
 //		return false;
 //	BOOST_FOREACH(BuddyInfo &b, roster) {
 //		if (buddy_id == b.id) {
 //// 			std::cout << "Adding buddy info setting " << key << "\n";
 //			b.settings[key] = var;
 //			buddy_id = -1;
 //		}
 //		while(buddy_id == -1 && m_getBuddiesSettings->fetch() == 0) {
 //			std::string val;
 //			*m_getBuddiesSettings >> buddy_id >> var.type >> key >> val;
 //			switch (var.type) {
 //				case TYPE_BOOLEAN:
 //					var.b = atoi(val.c_str());
 //					break;
 //				case TYPE_STRING:
 //					var.s = val;
 //					break;
 //				default:
 //					if (buddy_id == b.id) {
 //						buddy_id = -1;
 //					}
 //					continue;
 //					break;
 //			}
 //			if (buddy_id == b.id) {
 //// 				std::cout << "Adding buddy info setting " << key << "=" << val << "\n";
 //				b.settings[key] = var;
 //				buddy_id = -1;
 //			}
 //		}
 //	}
 		return true;
+	}
 	catch (std::exception& e) {
 		LOG4CXX_ERROR(logger, e.what());
+	}
 //	while(m_getBuddiesSettings->fetch() == 0) {
 //		// TODO: probably remove those settings, because there's no buddy for them.
 //		// It should not happend, but one never know...
 //	}
 	return true;
 	return false;
+}
 bool PQXXBackend::removeUser(long id) {
@@ @@ -329,6 +320,7 @@ bool PQXXBackend::removeUser(long id) { @@
 		exec(txn, "DELETE FROM " + m_prefix + "buddies_settings SET user_id=" + pqxx::to_string(id));
 		return true;
+	}
 	catch (std::exception& e) {
 		LOG4CXX_ERROR(logger, e.what());
+	}
+		}
 		else {
 			type = r[0][0].as<int>();
-			value = r[0][0].as<std::string>();
+			value = r[0][1].as<std::string>();
+		}
+	}
 	catch (std::exception& e) {

0 comments (0 inline, 0 general)