From b2c874d5f892b7a2d1596d06d4455ab9e709cae8 Mon Sep 17 00:00:00 2001
From: "James D. Callahan III" <darkenelf@gmail.com>
Date: Thu, 18 Mar 2010 19:59:40 -0400
Subject: [PATCH] Added GenericAddRecipeAcquire() - addon:AddRecipeTrainer()
 and addon:AddRecipeVendor() are now simply wrappers for
 this function. Added addon:AddRecipeMobDrop() using this
 interface.

---
 ARL.lua      |   79 ++++++++++++++++------------------------------------------
 Datamine.lua |    4 +--
 2 files changed, 24 insertions(+), 59 deletions(-)

diff --git a/ARL.lua b/ARL.lua
index 35fe3c6..6157ea8 100644
--- a/ARL.lua
+++ b/ARL.lua
@@ -1060,38 +1060,36 @@ do
 		recipe_list[spell_id].locations = (#location_list == 0 and "" or tconcat(location_list, ", "))
 	end
 
-	function addon:AddRecipeTrainer(spell_id, ...)
+	local function GenericAddRecipeAcquire(spell_id, acquire_type, type_string, unit_list, ...)
 		local num_vars = select('#', ...)
 		local cur_var = 1
-
 		local recipe = private.recipe_list[spell_id]
-		local trainer_list = private.trainer_list
 
 		local acquire_data = recipe.acquire_data
-		acquire_data[A.TRAINER] = acquire_data[A.TRAINER] or {}
+		acquire_data[acquire_type] = acquire_data[acquire_type] or {}
 
-		local acquire = acquire_data[A.TRAINER]
+		local acquire = acquire_data[acquire_type]
 
 		twipe(location_list)
 		twipe(location_checklist)
 
 		while cur_var <= num_vars do
 			local location
-			local trainer_id = select(cur_var, ...)
+			local id_num = select(cur_var, ...)
 			cur_var = cur_var + 1
 
-			acquire[trainer_id] = true
+			acquire[id_num] = true
 
-			if not trainer_list[trainer_id] then
+			if not unit_list[id_num] then
 				--@alpha@
-				self:Print("Spell ID "..spell_id..": TrainerID "..trainer_id.." does not exist in the database.")
+				self:Printf("Spell ID %d: %s ID %d does not exist in the database.", spell_id, type_string, id_num)
 				--@end-alpha@
 			else
-				local trainer = trainer_list[trainer_id]
-				location = trainer.location
+				local unit = unit_list[id_num]
+				location = unit.location
 
-				trainer.teaches = trainer.teaches or {}
-				trainer.teaches[spell_id] = true
+				unit.item_list = unit.item_list or {}
+				unit.item_list[spell_id] = true
 			end
 
 			if location and not location_checklist[location] then
@@ -1106,52 +1104,19 @@ do
 		locations = locations .. (#location_list == 0 and "" or tconcat(location_list, ", "))
 	end
 
-	function addon:AddRecipeVendor(spell_id, ...)
-		local num_vars = select('#', ...)
-		local cur_var = 1
-
-		local recipe = private.recipe_list[spell_id]
-		local vendor_list = private.vendor_list
-
-		local acquire_data = recipe.acquire_data
-		acquire_data[A.VENDOR] = acquire_data[A.VENDOR] or {}
-
-		local acquire = acquire_data[A.VENDOR]
-
-		twipe(location_list)
-		twipe(location_checklist)
-
-		while cur_var <= num_vars do
-			local location
-			local vendor_id = select(cur_var, ...)
-			cur_var = cur_var + 1
-
-			acquire[vendor_id] = true
-
-			if not vendor_list[vendor_id] then
-				--@alpha@
-				self:Print("Spell ID "..spell_id..": Vendor ID "..vendor_id.." does not exist in the database.")
-				--@end-alpha@
-			else
-				local vendor = vendor_list[vendor_id]
-				location = vendor.location
-
-				vendor.sells = vendor.sells or {}
-				vendor.sells[spell_id] = true
-			end
+	function addon:AddRecipeMobDrop(spell_id, ...)
+		GenericAddRecipeAcquire(spell_id, A.MOB, "Mob", private.mob_list, ...)
+	end
 
-			if location and not location_checklist[location] then
-				tinsert(location_list, location)
-				location_checklist[location] = true
-			end
-		end
-		local locations = recipe.locations
-		locations = locations or ""
+	function addon:AddRecipeTrainer(spell_id, ...)
+		GenericAddRecipeAcquire(spell_id, A.TRAINER, "Trainer", private.trainer_list, ...)
+	end
 
-		table.sort(location_list, LocationSort)
-		locations = locations .. (#location_list == 0 and "" or tconcat(location_list, ", "))
+	function addon:AddRecipeVendor(spell_id, ...)
+		GenericAddRecipeAcquire(spell_id, A.VENDOR, "Vendor", private.vendor_list, ...)
 	end
 
+	-- This function can NOT use GenericAddRecipeAcquire() - reputation vendors are more complicated than the other acquire types.
 	function addon:AddRecipeRepVendor(spell_id, faction_id, rep_level, ...)
 		local num_vars = select('#', ...)
 		local cur_var = 1
@@ -1195,8 +1160,8 @@ do
 					local rep_vendor = vendor_list[vendor_id]
 					location = rep_vendor.location
 
-					rep_vendor.sells = rep_vendor.sells or {}
-					rep_vendor.sells[spell_id] = true
+					rep_vendor.item_list = rep_vendor.item_list or {}
+					rep_vendor.item_list[spell_id] = true
 				end
 			end
 
diff --git a/Datamine.lua b/Datamine.lua
index 708ca1f..57cd971 100644
--- a/Datamine.lua
+++ b/Datamine.lua
@@ -1472,7 +1472,7 @@ do
 	local FUNCTION_FORMATS = {
 		[A.TRAINER]	= "self:AddRecipeTrainer(%d, %s)",
 		[A.VENDOR]	= "self:AddRecipeVendor(%d, %s)",
-		[A.QUEST]	= "self:AddRecipeQuest(%d, %s)",
+		[A.MOB]		= "self:AddRecipeMobDrop(%d, %s)",
 	}
 
 	local function RecipeDump(id, single)
@@ -1524,7 +1524,7 @@ do
 						tinsert(output, string.format("self:AddRecipeRepVendor(%d, %s, %s, %s)", recipe.spell_id, faction_string, rep_string, values))
 					end
 				end
-			elseif acquire_type == A.TRAINER or acquire_type == A.VENDOR then
+			elseif FUNCTION_FORMATS[acquire_type] then
 				local values
 
 				for id_num in pairs(acquire_info) do
-- 
1.7.9.5