pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-06-01 14:21:37 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

WIP

Browse Source
This commit is contained in:
Mitch Freeman
2025-04-13 15:34:13 -03:00
parent b06ca47d46
commit a0450ac39e
6 changed files with 118 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/repositories/trader_repository.h
+33 -33
View File
@@ -309,41 +309,41 @@ public:
{
std::vector<BazaarTraderSearch_Struct> all_entries{};
auto query_2 = fmt::format(
"WITH ranked_trader_items AS ("
"SELECT trader.id, trader.character_id, trader.item_id, trader.item_unique_id, trader.augment_one, "
"trader.augment_two, trader.augment_three, trader.augment_four, trader.augment_five, trader.augment_six, "
"trader.item_charges, trader.item_cost, trader.slot_id, trader.char_entity_id, trader.char_zone_id, "
"trader.char_zone_instance_id, trader.active_transaction, c.`name`, "
"items.name AS n1, items.stackable, items.icon, {}, "
"ROW_NUMBER() OVER (PARTITION BY trader.character_id) AS row_num "
"FROM trader "
"INNER JOIN character_data AS c ON trader.character_id = c.id "
"JOIN peq642024_content.items AS items ON trader.item_id = items.id "
"WHERE items.`name` LIKE '%{}%' AND {} AND {}"
") "
"SELECT * FROM ranked_trader_items "
"WHERE row_num <= '{}';",
field_criteria_items,
Strings::Escape(name),
where_criteria_items,
search_criteria_trader,
max_results
);
// auto query = fmt::format(
// auto query_2 = fmt::format(
// "WITH ranked_trader_items AS ("
// "SELECT trader.id, trader.character_id, trader.item_id, trader.item_unique_id, trader.augment_one, "
// "trader.augment_two, trader.augment_three, trader.augment_four, trader.augment_five, trader.augment_six, "
// "trader.item_charges, trader.item_cost, trader.slot_id, trader.char_entity_id, trader.char_zone_id, "
// "trader.char_zone_instance_id, trader.active_transaction, c.`name` FROM `trader` "
// "trader.char_zone_instance_id, trader.active_transaction, c.`name`, "
// "items.name AS n1, items.stackable, items.icon, {}, "
// "ROW_NUMBER() OVER (PARTITION BY trader.character_id) AS row_num "
// "FROM trader "
// "INNER JOIN character_data AS c ON trader.character_id = c.id "
// "WHERE {} "
// "GROUP BY trader.item_id "
// "ORDER BY trader.character_id ASC",
// search_criteria_trader
// "JOIN peq642024_content.items AS items ON trader.item_id = items.id "
// "WHERE items.`name` LIKE '%{}%' AND {} AND {}"
// ") "
// "SELECT * FROM ranked_trader_items "
// "WHERE row_num <= '{}';",
// field_criteria_items,
// Strings::Escape(name),
// where_criteria_items,
// search_criteria_trader,
// max_results
// );
auto results = db.QueryDatabase(query_2);
auto query = fmt::format(
"SELECT trader.id, trader.character_id, trader.item_id, trader.item_unique_id, trader.augment_one, "
"trader.augment_two, trader.augment_three, trader.augment_four, trader.augment_five, trader.augment_six, "
"trader.item_charges, trader.item_cost, trader.slot_id, trader.char_entity_id, trader.char_zone_id, "
"trader.char_zone_instance_id, trader.active_transaction, c.`name` FROM `trader` "
"INNER JOIN character_data AS c ON trader.character_id = c.id "
"WHERE {} "
"GROUP BY trader.item_id "
"ORDER BY trader.character_id ASC",
search_criteria_trader
);
auto results = db.QueryDatabase(query);
if (results.RowCount() == 0) {
return all_entries;
@@ -371,10 +371,10 @@ public:
e.trader.char_zone_instance_id = row[15] ? static_cast<int32_t>(atoi(row[15])) : 0;
e.trader.active_transaction = row[16] ? static_cast<uint8_t>(strtoul(row[16], nullptr, 10)) : 0;
e.trader_name = row[17] ? row[17] : std::string("");
e.name = row[18] ? row[18] : "";
e.stackable = atoi(row[19]) ? true : false;
e.icon = row[20] ? static_cast<int32_t>(atoi(row[20])) : 0;
e.stats = row[21] ? static_cast<int32_t>(atoi(row[21])) : 0;
// e.name = row[18] ? row[18] : "";
// e.stackable = atoi(row[19]) ? true : false;
// e.icon = row[20] ? static_cast<int32_t>(atoi(row[20])) : 0;
// e.stats = row[21] ? static_cast<int32_t>(atoi(row[21])) : 0;
all_entries.push_back(e);
}