libtransport.git Changeset - 7f5a07be383f

Changeset - 7f5a07be383f

Parent rev.

Child rev.

[Not reviewed]

0 1 0

Daniel Henninger - 13 years ago 2012-02-17 19:49:57
daniel@vorpalcloud.org

Cleaned up code a bit, primarily adding more exception catching in proper locations.

1 file changed with 48 insertions and 32 deletions:

src/pqxxbackend.cpp

0 comments (0 inline, 0 general)

src/pqxxbackend.cpp

➞

Show inline comments

@@ @@ -57,7 +57,14 @@ bool PQXXBackend::connect() { @@
 	str += CONFIG_STRING(m_config, "database.database") + " ";
 	str += "user=" + CONFIG_STRING(m_config, "database.user") + " ";
 	m_conn = new pqxx::connection(str);
 	try {
 		m_conn = new pqxx::connection(str);
+	}
 	catch (std::exception& e) {
 		LOG4CXX_ERROR(logger, e.what());
 		return false;
+	}
 	createDatabase();
@@ @@ -152,15 +159,20 @@ void PQXXBackend::setUser(const UserInfo &user) { @@
 	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);
 	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'") +")");
 	try {
 		pqxx::nontransaction txn(*m_conn);
 		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'") +")");
+	}
 	catch (std::exception& e) {
 		LOG4CXX_ERROR(logger, e.what());
+	}
+}
 bool PQXXBackend::getUser(const std::string &barejid, UserInfo &user) {
+}
 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 "
 	try {
 		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) + ","
 			+ 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();
 			+ 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) + ")");
+		}
 	return id;
 		return id;
+	}
 	catch (std::exception& e) {
 		LOG4CXX_ERROR(logger, e.what());
 		return -1;
+	}
+}
 void PQXXBackend::updateBuddy(long userId, const BuddyInfo &buddyInfo) {

0 comments (0 inline, 0 general)