libtransport.git Changeset - 68f1f2897fc2

Changeset - 68f1f2897fc2

Parent rev.

Child rev.

[Not reviewed]

0 1 0

Daniel Henninger - 14 years ago 2012-02-16 00:12:09
daniel@vorpalcloud.org

Cleaned up code a bit, more to come.

1 file changed with 13 insertions and 13 deletions:

src/pqxxbackend.cpp

0 comments (0 inline, 0 general)

src/pqxxbackend.cpp

➞

Show inline comments

@@ @@ -78,50 +78,50 @@ bool PQXXBackend::createDatabase() { @@
 				"PRIMARY KEY (buddy_id,var)"
 			");");
 		exec("CREATE TYPE Subscription AS ENUM ('to','from','both','ask','none');");
 		exec("CREATE TABLE " + m_prefix + "buddies ("
 							"id SERIAL,"
 							"user_id integer NOT NULL,"
 							"uin varchar(255) NOT NULL,"
 							"subscription Subscription NOT NULL,"
 							"nickname varchar(255) NOT NULL,"
 							"groups varchar(255) NOT NULL,"
 							"flags smallint NOT NULL DEFAULT '0',"
 							"PRIMARY KEY (id),"
 							"UNIQUE (user_id,uin)"
 						");");
 		exec("CREATE TABLE " + m_prefix + "users ("
 				"id SERIAL,"
 				"jid varchar(255) NOT NULL,"
 				"uin varchar(4095) NOT NULL,"
 				"password varchar(255) NOT NULL,"
 				"language varchar(25) NOT NULL,"
 				"encoding varchar(50) NOT NULL default 'utf8',"
 				"last_login timestamp,"
 				"vip boolean NOT NULL  default '0',"
 				"online boolean NOT NULL  default '0',"
 				"vip boolean NOT NULL  default 'false',"
 				"online boolean NOT NULL  default 'false',"
 				"PRIMARY KEY (id),"
 				"UNIQUE (jid)"
 			");");
 		exec("CREATE TABLE " + m_prefix + "users_settings ("
 				"user_id integer NOT NULL,"
 				"var varchar(50) NOT NULL,"
 				"type smallint NOT NULL,"
 				"value varchar(255) NOT NULL,"
 				"PRIMARY KEY (user_id,var)"
 			");");
 		exec("CREATE TABLE " + m_prefix + "db_version ("
 				"ver integer NOT NULL default '1',"
 				"UNIQUE (ver)"
 			");");
  		exec("INSERT INTO db_version (ver) VALUES ('1');");
+	}
 	return true;
+}
 template<typename T>
 bool PQXXBackend::exec(const std::string &query, bool show_error) {
 	pqxx::nontransaction txn(*m_conn);
 	return exec(txn, query, show_error);
+}
 bool PQXXBackend::exec(pqxx::nontransaction &txn, const std::string &query, bool show_error) {
 	try {
 		txn.exec(query);
 		txn.commit();
+	}
 	catch (std::exception& e) {
 		if (show_error)
 			LOG4CXX_ERROR(logger, e.what());
 		return false;
+	}
 	return true;
+}
 void PQXXBackend::setUser(const UserInfo &user) {
 	std::string encrypted = user.password;
 	if (!CONFIG_STRING(m_config, "database.encryption_key").empty()) {
 		encrypted = Util::encryptPassword(encrypted, CONFIG_STRING(m_config, "database.encryption_key"));
+	}
 	pqxx::nontransaction txn(*m_conn);
 	exec(txn, "INSERT INTO " + m_prefix + "users (jid, uin, password, language, encoding, last_login, vip) VALUES "
 		 "(" + quote(txn, user.jid) + ","
 	txn.exec("INSERT INTO " + m_prefix + "users (jid, uin, password, language, encoding, last_login, vip) VALUES "
 		+ "(" + quote(txn, user.jid) + ","
 		+ quote(txn, user.uin) + ","
 		+ quote(txn, encrypted) + ","
 		+ quote(txn, user.language) + ","
 		+ quote(txn, user.encoding) + ","
 		+ "NOW(),"
 		+ (user.vip ? "'true'" : "'false'") +")");
+}
 bool PQXXBackend::getUser(const std::string &barejid, UserInfo &user) {
 	try {
 		pqxx::nontransaction txn(*m_conn);
 		pqxx::result r = txn.exec("SELECT id, jid, uin, password, encoding, language, vip FROM " + m_prefix + "users WHERE jid="
 			+ quote(txn, barejid));
 		if (r.size() == 0) {
 			return false;
+		}
 		user.id = r[0][0].as<int>();
 		user.jid = r[0][1].as<std::string>();
 		user.uin = r[0][2].as<std::string>();
 		user.password = r[0][3].as<std::string>();
 		user.encoding = r[0][4].as<std::string>();
 		user.language = r[0][5].as<std::string>();
 		user.vip = r[0][6].as<bool>();
+	}
 	catch (std::exception& e) {
 		LOG4CXX_ERROR(logger, e.what());
 		return false;
+	}
 	return true;
+}
 void PQXXBackend::setUserOnline(long id, bool online) {
 	try {
 		pqxx::nontransaction txn(*m_conn);
-		exec(txn, "UPDATE " + m_prefix + "users SET online=" + (online ? "'true'" : "'false'") + ", last_login=NOW() WHERE id=" + pqxx::to_string(id));
+		txn.exec("UPDATE " + m_prefix + "users SET online=" + (online ? "'true'" : "'false'") + ", last_login=NOW() WHERE id=" + pqxx::to_string(id));
+	}
 	catch (std::exception& e) {
 		LOG4CXX_ERROR(logger, e.what());
+	}
+}
 bool PQXXBackend::getOnlineUsers(std::vector<std::string> &users) {
 	try {
 		pqxx::nontransaction txn(*m_conn);
-		pqxx::result r = txn.exec("SELECT jid FROM " + m_prefix + "users WHERE online=1");
+		pqxx::result r = txn.exec("SELECT jid FROM " + m_prefix + "users WHERE online='true'");
 		for (pqxx::result::const_iterator it = r.begin(); it != r.end(); it++)  {
 			users.push_back((*it)[0].as<std::string>());
+		}
+	}
 	catch (std::exception& e) {
 		LOG4CXX_ERROR(logger, e.what());
 		return false;
+	}
 	return true;
+}
 long PQXXBackend::addBuddy(long userId, const BuddyInfo &buddyInfo) {
 	pqxx::nontransaction txn(*m_conn);
 	pqxx::result r = txn.exec("INSERT INTO " + m_prefix + "buddies (user_id, uin, subscription, groups, nickname, flags) VALUES "
 		+ "(" + pqxx::to_string(userId) + ","
 		+ quote(txn, buddyInfo.legacyName) + ","
 		+ quote(txn, buddyInfo.subscription) + ","
 		+ quote(txn, Util::serializeGroups(buddyInfo.groups)) + ","
 		+ quote(txn, buddyInfo.alias) + ","
 		+ pqxx::to_string(buddyInfo.flags) + ") RETURNING id");
 	long id = r[0][0].as<long>();
 	r = txn.exec("UPDATE " + m_prefix + "buddies_settings SET var = " + quote(txn, buddyInfo.settings.find("icon_hash")->first) + ", type = " + pqxx::to_string((int)TYPE_STRING) + ", value = " + quote(txn, buddyInfo.settings.find("icon_hash")->second.s) + " WHERE user_id = " + pqxx::to_string(userId) + " AND buddy_id = " + pqxx::to_string(id));
 	if (r.affected_rows() == 0) {
 		txn.exec("INSERT INTO " + m_prefix + "buddies_settings (user_id, buddy_id, var, type, value) VALUES "
 			+ "(" + pqxx::to_string(userId) + ","
 			+ pqxx::to_string(id) + ","
 			+ quote(txn, buddyInfo.settings.find("icon_hash")->first) + ","
 			+ pqxx::to_string((int)TYPE_STRING) + ","
 			+ quote(txn,  buddyInfo.settings.find("icon_hash")->second.s) + ")");
+	}
 	txn.commit();
 	return id;
+}
 void PQXXBackend::updateBuddy(long userId, const BuddyInfo &buddyInfo) {
 	try {
 		pqxx::nontransaction txn(*m_conn);
-		exec(txn, "UPDATE " + m_prefix + "buddies SET groups=" + quote(txn, Util::serializeGroups(buddyInfo.groups)) + ", nickname=" + quote(txn, buddyInfo.alias) + ", flags=" + pqxx::to_string(buddyInfo.flags) + ", subscription=" + quote(txn, buddyInfo.subscription) + " WHERE user_id=" + pqxx::to_string(userId) + " AND uin=" + quote(txn, buddyInfo.legacyName));
+		txn.exec("UPDATE " + m_prefix + "buddies SET groups=" + quote(txn, Util::serializeGroups(buddyInfo.groups)) + ", nickname=" + quote(txn, buddyInfo.alias) + ", flags=" + pqxx::to_string(buddyInfo.flags) + ", subscription=" + quote(txn, buddyInfo.subscription) + " WHERE user_id=" + pqxx::to_string(userId) + " AND uin=" + quote(txn, buddyInfo.legacyName));
+	}
 	catch (std::exception& e) {
 		LOG4CXX_ERROR(logger, e.what());
+	}
+}
 bool PQXXBackend::getBuddies(long id, std::list<BuddyInfo> &roster) {
 	try {
 		pqxx::nontransaction txn(*m_conn);
 		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;
 			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>();
 			if (!group.empty()) {
 				b.groups = Util::deserializeGroups(group);
 					continue;
 					break;
+			}
 			BOOST_FOREACH(BuddyInfo &b, roster) {
 				if (buddy_id == b.id) {
 					b.settings[key] = var;
 					break;
+				}
+			}
+		}
 		return true;
+	}
 	catch (std::exception& e) {
 		LOG4CXX_ERROR(logger, e.what());
+	}
 	return false;
+}
 bool PQXXBackend::removeUser(long id) {
 	try {
 		pqxx::nontransaction txn(*m_conn);
 		exec(txn, "DELETE FROM " + m_prefix + "users SET id=" + pqxx::to_string(id));
 		exec(txn, "DELETE FROM " + m_prefix + "buddies SET user_id=" + pqxx::to_string(id));
 		exec(txn, "DELETE FROM " + m_prefix + "user_settings SET user_id=" + pqxx::to_string(id));
 		exec(txn, "DELETE FROM " + m_prefix + "buddies_settings SET user_id=" + pqxx::to_string(id));
 		txn.exec("DELETE FROM " + m_prefix + "users SET id=" + pqxx::to_string(id));
 		txn.exec("DELETE FROM " + m_prefix + "buddies SET user_id=" + pqxx::to_string(id));
 		txn.exec("DELETE FROM " + m_prefix + "user_settings SET user_id=" + pqxx::to_string(id));
 		txn.exec("DELETE FROM " + m_prefix + "buddies_settings SET user_id=" + pqxx::to_string(id));
 		return true;
+	}
 	catch (std::exception& e) {
 		LOG4CXX_ERROR(logger, e.what());
+	}
 	return false;
+}
 void PQXXBackend::getUserSetting(long id, const std::string &variable, int &type, std::string &value) {
 	try {
 		pqxx::nontransaction txn(*m_conn);
 		pqxx::result r = txn.exec("SELECT type, value FROM " + m_prefix + "users_settings WHERE user_id=" + pqxx::to_string(id) + " AND var=" + quote(txn, variable));
 		if (r.size() == 0) {
-			txn.exec(txn, "INSERT INTO " + m_prefix + "users_settings (user_id, var, type, value) VALUES(" + pqxx::to_string(id) + "," + quote(txn, variable) + "," + pqxx::to_string(type) + "," + quote(txn, value) + ")");
+			txn.exec("INSERT INTO " + m_prefix + "users_settings (user_id, var, type, value) VALUES(" + pqxx::to_string(id) + "," + quote(txn, variable) + "," + pqxx::to_string((int)type) + "," + quote(txn, value) + ")");
+		}
 		else {
 			type = r[0][0].as<int>();
 			value = r[0][1].as<std::string>();
+		}
+	}
 	catch (std::exception& e) {
 		LOG4CXX_ERROR(logger, e.what());
+	}
+}
 void PQXXBackend::updateUserSetting(long id, const std::string &variable, const std::string &value) {
 	try {
 		pqxx::nontransaction txn(*m_conn);
-		exec(txn, "UPDATE " + m_prefix + "users_settings SET value=" + quote(txn, value) + " WHERE user_id=" + pqxx::to_string(id) + " AND var=" + quote(txn, variable));
+		txn.exec("UPDATE " + m_prefix + "users_settings SET value=" + quote(txn, value) + " WHERE user_id=" + pqxx::to_string(id) + " AND var=" + quote(txn, variable));
+	}
 	catch (std::exception& e) {
 		LOG4CXX_ERROR(logger, e.what());
+	}
+}
 void PQXXBackend::beginTransaction() {
 	exec("BEGIN;");
+}
 void PQXXBackend::commitTransaction() {
 	exec("COMMIT;");
+}
+}
 #endif

0 comments (0 inline, 0 general)