Mercurial > wow > itemauditor

diff Modules/Utils.lua @ 86:8d5ad3b71f6f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Removed references to Skillet in core functionality. Skillet really should be optional.
author Asa Ayers <Asa.Ayers@Gmail.com>
date Sat, 07 Aug 2010 11:16:21 -0700
parents 32d53abee666
children 26f45b6e8d4d
line wrap: on
line diff
--- a/Modules/Utils.lua	Fri Aug 06 05:59:29 2010 -0700
+++ b/Modules/Utils.lua	Sat Aug 07 11:16:21 2010 -0700
@@ -65,27 +65,33 @@
 
 
 local tmp_item_cache = {}
-function Utils.GetItemID(itemName)
-	if tmp_item_cache[itemName] == nil then
-		local _, itemLink = GetItemInfo (itemName);
+function Utils.GetItemID(item)
+	if not item then
+		return nil
+	end
+
+	if tmp_item_cache[item] == nil then
+		-- Whether item is a link or a name, both should return the full link
+		DevTools_Dump(item)
+		local _, itemLink = GetItemInfo (item);
 		if itemLink ~= nil then
 			local _, _, _, _, itemID = string.find(itemLink, "|?c?f?f?(%x*)|?H?([^:]*):?(%d+):?(%d*):?(%d*):?(%d*):?(%d*):?(%d*):?(%-?%d*):?(%-?%d*):?(%d*)|?h?%[?([^%[%]]*)%]?|?h?|?r?")
-			tmp_item_cache[itemName] = tonumber(itemID)
+			tmp_item_cache[item] = tonumber(itemID)
 		end
 	end
 	
-	if tmp_item_cache[itemName] == nil then
+	if tmp_item_cache[item] == nil then
 		for link, data in pairs(ItemAuditor.db.factionrealm.items) do
 			local name, itemLink = GetItemInfo (link);
-			if name == itemName then
+			if name == item then
 				local _, _, _, _, itemID = string.find(itemLink, "|?c?f?f?(%x*)|?H?([^:]*):?(%d+):?(%d*):?(%d*):?(%d*):?(%d*):?(%d*):?(%-?%d*):?(%-?%d*):?(%d*)|?h?%[?([^%[%]]*)%]?|?h?|?r?")
-				tmp_item_cache[itemName] = tonumber(itemID)
+				tmp_item_cache[item] = tonumber(itemID)
 			end
 		end
 		
 	end
 	
-	return tmp_item_cache[itemName]
+	return tmp_item_cache[item]
 end