GetDoorsDBCountPlusOne converted to QueryDatabase

This commit is contained in:
Arthur Ice 2014-08-24 12:08:39 -07:00
parent 8f4e2e99db
commit 5d6d489889

View File

@ -617,34 +617,27 @@ int32 ZoneDatabase::GetDoorsCountPlusOne(const char *zone_name, int16 version) {
} }
int32 ZoneDatabase::GetDoorsDBCountPlusOne(const char *zone_name, int16 version) { int32 ZoneDatabase::GetDoorsDBCountPlusOne(const char *zone_name, int16 version) {
char errbuf[MYSQL_ERRMSG_SIZE];
char *query = 0;
uint32 oMaxID = 0; uint32 oMaxID = 0;
MYSQL_RES *result; std::string query = StringFormat("SELECT MAX(doorid) FROM doors "
MYSQL_ROW row; "WHERE zone = '%s' AND (version = %u OR version = -1)",
query = new char[256]; zone_name, version);
sprintf(query, "SELECT MAX(doorid) FROM doors WHERE zone='%s' AND (version=%u OR version=-1)", zone_name, version); auto results = QueryDatabase(query);
if (RunQuery(query, strlen(query), errbuf, &result)) { if (!results.Success()) {
safe_delete_array(query); std::cerr << "Error in GetDoorsCountPlusOne query '" << query << "' " << results.ErrorMessage() << std::endl;
row = mysql_fetch_row(result);
if (row != nullptr && row[1] != 0) {
if (row[0])
oMaxID = atoi(row[0]) + 1;
else
oMaxID = 0;
mysql_free_result(result);
return oMaxID;
}
mysql_free_result(result);
}
else {
std::cerr << "Error in GetDoorsCountPlusOne query '" << query << "' " << errbuf << std::endl;
safe_delete_array(query);
return -1; return -1;
} }
return -1; if (results.RowCount() != 1)
return -1;
auto row = results.begin();
if (!row[0])
return 0;
return atoi(row[0]) + 1;
} }
bool ZoneDatabase::LoadDoors(int32 iDoorCount, Door *into, const char *zone_name, int16 version) { bool ZoneDatabase::LoadDoors(int32 iDoorCount, Door *into, const char *zone_name, int16 version) {