From 38d04931bab0593a2c259614595f38defc62fdb3 Mon Sep 17 00:00:00 2001
From: Arthur Ice <addtheice@gmail.com>
Date: Wed, 3 Sep 2014 17:52:06 -0700
Subject: [PATCH] LoadBotGroup converted to QueryDatabase

---
 zone/bot.cpp | 50 +++++++++++++++++++-------------------------------
 1 file changed, 19 insertions(+), 31 deletions(-)

diff --git a/zone/bot.cpp b/zone/bot.cpp
index 6aa14682b..b33b74b64 100644
--- a/zone/bot.cpp
+++ b/zone/bot.cpp
@@ -4744,44 +4744,32 @@ void Bot::DeleteBotGroup(std::string botGroupName, std::string* errorMessage) {
 }
 
 std::list<BotGroup> Bot::LoadBotGroup(std::string botGroupName, std::string* errorMessage) {
-	std::list<BotGroup> Result;
-	char ErrBuf[MYSQL_ERRMSG_SIZE];
-	char* Query = 0;
-	MYSQL_RES* DatasetResult;
-	MYSQL_ROW DataRow;
+	std::list<BotGroup> botGroup;
 
-	if(!botGroupName.empty()) {
-		uint32 botGroupId = GetBotGroupIdByBotGroupName(botGroupName, errorMessage);
+	if(botGroupName.empty())
+        return botGroup;
 
-		if(botGroupId > 0) {
-			if(!database.RunQuery(Query, MakeAnyLenString(&Query, "select BotId from botgroupmembers where BotGroupId = %u", botGroupId), ErrBuf, &DatasetResult)) {
-				*errorMessage = std::string(ErrBuf);
-			}
-			else {
-				uint32 RowCount = mysql_num_rows(DatasetResult);
+	uint32 botGroupId = GetBotGroupIdByBotGroupName(botGroupName, errorMessage);
 
-				if(RowCount > 0) {
-					for(int iCounter = 0; iCounter < RowCount; iCounter++) {
-						DataRow = mysql_fetch_row(DatasetResult);
+	if(botGroupId == 0)
+        return botGroup;
 
-						if(DataRow) {
-							BotGroup tempBotGroup;
-							tempBotGroup.BotGroupID = botGroupId;
-							tempBotGroup.BotID = atoi(DataRow[0]);
+	std::string query = StringFormat("SELECT BotId FROM botgroupmembers WHERE BotGroupId = %u", botGroupId);
+	auto results = database.QueryDatabase(query);
+    if(!results.Success()) {
+        *errorMessage = std::string(results.ErrorMessage());
+        return botGroup;
+    }
 
-							Result.push_back(tempBotGroup);
-						}
-					}
-				}
+    for(auto row = results.begin(); row != results.end(); ++row) {
+        BotGroup tempBotGroup;
+        tempBotGroup.BotGroupID = botGroupId;
+        tempBotGroup.BotID = atoi(row[0]);
 
-				mysql_free_result(DatasetResult);
-			}
+        botGroup.push_back(tempBotGroup);
+    }
 
-			safe_delete_array(Query);
-		}
-	}
-
-	return Result;
+	return botGroup;
 }
 
 std::list<BotGroupList> Bot::GetBotGroupListByBotOwnerCharacterId(uint32 botOwnerCharacterId, std::string* errorMessage) {