ListRulesets converted to QueryDatabase

This commit is contained in:
Arthur Ice 2014-08-18 14:36:58 -07:00
parent b439881f37
commit 84e95d9a28

View File

@ -382,29 +382,22 @@ std::string RuleManager::GetRulesetName(Database *db, int id) {
} }
bool RuleManager::ListRulesets(Database *db, std::map<int, std::string> &into) { bool RuleManager::ListRulesets(Database *db, std::map<int, std::string> &into) {
char errbuf[MYSQL_ERRMSG_SIZE];
char *query = 0;
MYSQL_RES *result;
MYSQL_ROW row;
//start out with the default set which is always present. //start out with the default set which is always present.
into[0] = "default"; into[0] = "default";
if (db->RunQuery(query, MakeAnyLenString(&query, std::string query = "SELECT ruleset_id, name FROM rule_sets";
"SELECT ruleset_id,name" auto results = db->QueryDatabase(query);
" FROM rule_sets"), errbuf, &result)) if (results.Success())
{ {
while((row = mysql_fetch_row(result))) { LogFile->write(EQEMuLog::Error, "Error in ListRulesets query %s: %s", query.c_str(), results.ErrorMessage().c_str());
into[ atoi(row[0]) ] = row[1]; return false;
}
mysql_free_result(result);
safe_delete_array(query);
} else {
LogFile->write(EQEMuLog::Error, "Error in ListRulesets query %s: %s", query, errbuf);
safe_delete_array(query);
return(false);
} }
return(true);
for (auto row = results.begin(); row != results.end(); ++row)
into[ atoi(row[0]) ] = row[1];
return true;
} }
int32 RuleManager::GetIntRule(RuleManager::IntType t) const int32 RuleManager::GetIntRule(RuleManager::IntType t) const