Module:DataTableParser - Revision history

Operator at 04:22, 17 March 2025

2025-03-17T04:22:11Z

Operator at 04:02, 17 March 2025

2025-03-17T04:02:17Z

@@ Line 563: / Line 563: @@
 function p.displayBuilding(frame)
      local buildingName = frame.args[1] or frame.args.name
      if not buildingName then
@@ Line 588: / Line 589: @@
          return "Error: Building '" .. buildingName .. "' not found"
      end
      -- Map building data to template parameters
@@ Line 611: / Line 605: @@
      args["Components"] = building[11] or ""         -- Column 11: RecipeToBuild
      args["PlacedWith"] = building[12] or ""         -- Column 12: PlacedWith
      args["ImageFile"] = building[15] or ""          -- Column 15: ImageFile
      args["PrimarySource"] = "Crafting"              -- Default value
      -- Replace "-" placeholders with empty strings
@@ Line 639: / Line 654: @@
          args["PlacedWith"] = p.iconize({args = {[1] = args["PlacedWith"]}})
      end
      -- Expand the template with our parameters
-     return frame:expandTemplate{ title = 'BuildingRefinerDisplay', args = args }
+     return frame:preprocess(templateCall)
 end

Operator at 03:11, 17 March 2025

2025-03-17T03:11:27Z

← Older revision		Revision as of 23:11, 16 March 2025
Line 785:		Line 785:
	end		end

	if not building or not building[19] or building[19] == "-" or building[19] == "" then		-- Changed from column 19 to column 20 to account for the new Tier column
			if not building or not building[20] or building[20] == "-" or building[20] == "" then
	return "Coming Soon"		return "Coming Soon"
	end		end

	-- Get YouTube URL and extract video ID		-- Get YouTube URL and extract video ID (now from column 20)
	local youtubeUrl = building[19]		local youtubeUrl = building[20]
	local videoId = youtubeUrl:match("v=([%w-_]+)")		local videoId = youtubeUrl:match("v=([%w-_]+)")

Operator at 02:59, 17 March 2025

2025-03-17T02:59:37Z

← Older revision		Revision as of 22:59, 16 March 2025
Line 560:		Line 560:
	end		end

	~~-- Helper function to display building with the template~~
	~~-- Helper function to display building with the template~~
	-- Helper function to display building with the template		-- Helper function to display building with the template
	function p.displayBuilding(frame)		function p.displayBuilding(frame)
Line 591:		Line 589:
	end		end

	-- For debugging column ~~indices (uncomment when needed)~~		-- For debugging: uncomment to see actual column contents
	-- local ~~debug~~ = "Building columns:\n"		-- local debugOutput = "Building columns for '" .. buildingName .. "':\n"
	-- for i, value in ipairs(building) do		-- for i, value in ipairs(building) do
	-- ~~debug~~ = ~~debug~~ .. "Column " .. i .. ": " .. tostring(value) .. "\n"		-- debugOutput = debugOutput .. "Column " .. i .. ": " .. tostring(value or "nil") .. "\n"
	-- end		-- end
	-- return ~~debug~~		-- return debugOutput

	~~-- Updated column indices with Tier in column 3~~
	~~local colIndices = {~~
	~~["Name"] = 2, -- Column 2: Name~~
	~~["Tier"] = 3, -- Column 3: Tier (new)~~
	~~["Description"] = 4, -- Column 4: Description (shifted)~~
	~~["JourneyRequirement"] = 5, -- Column 5: Journey Requirement (shifted)~~
	~~["Health"] = 6, -- Column 6: Health (shifted)~~
	~~["PowerCost"] = 7, -- Column 7: Power Cost (shifted)~~
	~~["GeneratesPower"] = 8, -- Column 8: Generates Power (shifted)~~
	~~["StorageSlots"] = 9, -- Column 9: Storage Slots (shifted)~~
	~~["StorageCapacity"] = 10, -- Column 10: Storage Capacity (shifted)~~
	~~["RecipeToBuild"] = 11, -- Column 11: Recipe to Build (shifted)~~
	~~["PlacedWith"] = 12, -- Column 12: Placed With (shifted)~~
	~~["AdditionalNotes"] = 13, -- Column 13: Additional Notes (shifted)~~
	~~["SchematicRequirement"] = 14, -- Column 14: Schematic Requirement (shifted)~~
	~~["ImageFile"] = 15, -- Column 15: Image File (shifted)~~
	~~["IconFile"] = 16 -- Column 16: Icon File (shifted)~~
	}

	-- Map building data to template parameters		-- Map building data to template parameters
	local args = {}		local args = {}

	-- ~~Map core fields~~		-- Direct mapping with explicit indices based on the wiki table
	args["Name"] = building[~~colIndices["Name"]~~] or ""		args["Name"] = building[2] or "" -- Column 2: Name
	args["Tier"] = building[~~colIndices["Tier"]~~] or ""		args["Tier"] = building[3] or "" -- Column 3: Tier
	args["Description"] = building[~~colIndices["Description"]~~] or ""		args["Description"] = building[4] or "" -- Column 4: Description
	args["JourneyRequirement"] = building[~~colIndices["JourneyRequirement"]~~] or ""		args["JourneyRequirement"] = building[5] or "" -- Column 5: JourneyRequirement
	args["Health"] = building[~~colIndices["Health"]~~] or ""		args["Health"] = building[6] or "" -- Column 6: Health
	args["EnergyConsumption"] = building[~~colIndices["PowerCost"]~~] or ""		args["EnergyConsumption"] = building[7] or "" -- Column 7: PowerCost
	args["GeneratesPower"] = building[~~colIndices["GeneratesPower"]~~] or ""		args["GeneratesPower"] = building[8] or "" -- Column 8: GeneratesPower
	args["StorageSlots"] = building[~~colIndices["StorageSlots"]~~] or ""		args["StorageSlots"] = building[9] or "" -- Column 9: StorageSlots
	args["StorageVolume"] = building[~~colIndices["StorageCapacity"]~~] or ""		args["StorageVolume"] = building[10] or "" -- Column 10: StorageCapacity
	args["Components"] = building[~~colIndices["RecipeToBuild"]~~] or ""		args["Components"] = building[11] or "" -- Column 11: RecipeToBuild
	args["PlacedWith"] = building[~~colIndices["PlacedWith"]~~] or ""		args["PlacedWith"] = building[12] or "" -- Column 12: PlacedWith
	args["AdditionalNotes"] = building[~~colIndices["AdditionalNotes"]~~] or ""		args["AdditionalNotes"] = building[13] or "" -- Column 13: AdditionalNotes
	args["ImageFile"] = building[~~colIndices["ImageFile"]~~] or ""		args["ImageFile"] = building[15] or "" -- Column 15: ImageFile
	args["PrimarySource"] = "Crafting" -- Default value		args["PrimarySource"] = "Crafting" -- Default value

	-- Replace "-" placeholders with empty strings		-- Replace "-" placeholders with empty strings
Line 665:		Line 644:
	end		end

	-- Debug function to ~~help troubleshoot~~		-- Debug function to show raw building data
	function p.~~debugBuilding~~(frame)		function p.debugBuildingData(frame)
	local buildingName = frame.args[1] or ~~frame~~.~~args~~.~~name~~		local buildingName = frame.args[1] or mw.title.getCurrentTitle().text

	~~if not buildingName then~~
	~~return "Error: No building name provided"~~
	~~end~~

	-- Get building data ~~directly~~		-- Get building data
	local buildingData, err = loadBuildingWikiTable()		local buildingData, err = loadBuildingWikiTable()
	if not buildingData then		if not buildingData then
	return err		return "Error loading building data: " .. (err or "Unknown error")
	end		end

	~~local colMap = buildingData.colMap~~
	local rows = buildingData.rows		local rows = buildingData.rows

	-- Find the building		-- Find the building by name
	local building = nil		local building = nil
	for _, row in ipairs(rows) do		for _, row in ipairs(rows) do
	if row[~~colMap["Name"]~~] == buildingName then		if row[2] == buildingName then
	building = row		building = row
	break		break
Line 692:		Line 666:

	if not building then		if not building then
	return "~~Error:~~ Building '" .. buildingName .. "' not found"		return "Building '" .. buildingName .. "' not found."
	end		end

	-- Output all data ~~for debugging~~		-- Output all column data
	local ~~debug~~ = "~~Building~~: " .. buildingName .. "\n\n"		local output = "Data for building: " .. buildingName .. "\n\n"
	for k, v in ~~pairs~~(~~colMap~~) do
	~~debug~~ = ~~debug~~ .. k .. ": " .. tostring(~~building[v]~~ or "nil") .. "\n"		for i, value in ipairs(building) do
			output = output .. "Column " .. i .. ": " .. tostring(value or "nil") .. "\n"
	end		end

	return ~~debug~~		return output
	end		end

Operator at 02:47, 17 March 2025

2025-03-17T02:47:30Z

← Older revision		Revision as of 22:47, 16 March 2025
Line 560:		Line 560:
	end		end

			-- Helper function to display building with the template
	-- Helper function to display building with the template		-- Helper function to display building with the template
	-- Helper function to display building with the template		-- Helper function to display building with the template
Line 590:		Line 591:
	end		end

	-- For ~~simplicity and~~ to ~~avoid confusion~~, ~~map each parameter explicitly~~		-- For debugging column indices (uncomment when needed)
			-- local debug = "Building columns:\n"
			-- for i, value in ipairs(building) do
			-- debug = debug .. "Column " .. i .. ": " .. tostring(value) .. "\n"
			-- end
			-- return debug

			-- Updated column indices with Tier in column 3
			local colIndices = {
			["Name"] = 2, -- Column 2: Name
			["Tier"] = 3, -- Column 3: Tier (new)
			["Description"] = 4, -- Column 4: Description (shifted)
			["JourneyRequirement"] = 5, -- Column 5: Journey Requirement (shifted)
			["Health"] = 6, -- Column 6: Health (shifted)
			["PowerCost"] = 7, -- Column 7: Power Cost (shifted)
			["GeneratesPower"] = 8, -- Column 8: Generates Power (shifted)
			["StorageSlots"] = 9, -- Column 9: Storage Slots (shifted)
			["StorageCapacity"] = 10, -- Column 10: Storage Capacity (shifted)
			["RecipeToBuild"] = 11, -- Column 11: Recipe to Build (shifted)
			["PlacedWith"] = 12, -- Column 12: Placed With (shifted)
			["AdditionalNotes"] = 13, -- Column 13: Additional Notes (shifted)
			["SchematicRequirement"] = 14, -- Column 14: Schematic Requirement (shifted)
			["ImageFile"] = 15, -- Column 15: Image File (shifted)
			["IconFile"] = 16 -- Column 16: Icon File (shifted)
			}

			-- Map building data to template parameters
	local args = {}		local args = {}

	-- Map ~~row values to template parameters directly~~		-- Map core fields
	args["Name"] = building[2] or "" ~~-- Column 2: Name~~		args["Name"] = building[colIndices["Name"]] or ""
	args["~~Description~~"] = building[3] or "" ~~-- Column 3: Description~~		args["Tier"] = building[colIndices["Tier"]] or ""
	args["~~JourneyRequirement~~"] = building[4] or "" ~~-- Column 4: JourneyRequirement~~		args["Description"] = building[colIndices["Description"]] or ""
	args["~~Health~~"] = building[5] or "" ~~-- Column 5: Health~~		args["JourneyRequirement"] = building[colIndices["JourneyRequirement"]] or ""
	args["~~EnergyConsumption~~"] = building[6] or "" ~~-- Column 6: PowerCost~~		args["Health"] = building[colIndices["Health"]] or ""
	args["~~GeneratesPower~~"] = building[7] or "" ~~-- Column 7: GeneratesPower~~		args["EnergyConsumption"] = building[colIndices["PowerCost"]] or ""
	args["~~StorageSlots~~"] = building[8] or "" ~~-- Column 8: StorageSlots~~		args["GeneratesPower"] = building[colIndices["GeneratesPower"]] or ""
	args["~~StorageVolume~~"] = building[9] or "" ~~-- Column 9: StorageCapacity~~		args["StorageSlots"] = building[colIndices["StorageSlots"]] or ""
	args["~~Components~~"] = building[10] or "" ~~-- Column 10: RecipeToBuild~~		args["StorageVolume"] = building[colIndices["StorageCapacity"]] or ""
	args["~~PlacedWith~~"] = building[11] or "" ~~-- Column 11: PlacedWith~~		args["Components"] = building[colIndices["RecipeToBuild"]] or ""
	args["~~AdditionalNotes~~"] = building[~~12] or "" -- Column 12: AdditionalNotes~~		args["PlacedWith"] = building[colIndices["PlacedWith"]] or ""
	~~args~~["~~ImageFile~~"] ~~= building[14~~] or "" ~~-- Column 14: ImageFile~~		args["AdditionalNotes"] = building[colIndices["AdditionalNotes"]] or ""
	args["~~PrimarySource~~"] = ~~"Crafting" -- Default value~~		args["ImageFile"] = building[colIndices["ImageFile"]] or ""
			args["PrimarySource"] = "Crafting" -- Default value
	~~-- Handle YouTube video if present (Column 19: Youtube)~~
	if building[~~19] and building~~[~~19] ~=~~ "-" ~~and building[19~~] ~= "" ~~then~~
	~~-- Set video title~~
	args["~~VideoTitle~~"] ~~= "Building Guide"~~

	~~local youtubeUrl~~ = building[~~19]~~

	~~-- Extract video ID from the URL~~
	~~local videoId = youtubeUrl:match("v=(~~[~~%w-_]+)~~")
	~~if videoId then~~
	~~-- Use the #tag parser function instead of direct XML tags~~
	~~args["VideoEmbed~~"] ~~= '{{#tag:youtube\|' .. videoId .. '}}'~~
	~~else~~
	~~args["VideoEmbed"~~] = "~~Coming Soon~~"
	~~end~~
	~~else~~
	args["~~VideoEmbed~~"] = "~~Coming Soon~~"
	~~end~~

	-- Replace "-" placeholders with empty strings		-- Replace "-" placeholders with empty strings

Operator at 19:52, 16 March 2025

2025-03-16T19:52:30Z

← Older revision		Revision as of 15:52, 16 March 2025
Line 412:		Line 412:
	-- Start with the updated table headers		-- Start with the updated table headers
	local output = "<tr>\n" ..		local output = "<tr>\n" ..
	"<th>Output</th>\n" ..		"<th style=\"text-align:left;\">Output</th>\n" ..
	"<th>Ingredients</th>\n" ..		"<th style=\"text-align:left;\">Ingredients</th>\n" ..
	"<th>Craft Time</th>\n" ..		"<th style=\"text-align:left;\">Craft Time</th>\n" ..
	"</tr>\n"		"</tr>\n"

Line 457:		Line 457:
	-- Add table row		-- Add table row
	output = output .. "<tr>\n" ..		output = output .. "<tr>\n" ..
	"<td>" .. formattedOutput .. "</td>\n" ..		"<td style=\"text-align:left;\">" .. formattedOutput .. "</td>\n" ..
	"<td>" .. formattedIngredients .. "</td>\n" ..		"<td style=\"text-align:left;\">" .. formattedIngredients .. "</td>\n" ..
	"<td style=\"text-align:~~center~~;\">" .. time .. "</td>\n" ..		"<td style=\"text-align:left;\">" .. time .. "</td>\n" ..
	"</tr>\n"		"</tr>\n"
	end		end

Operator at 19:49, 16 March 2025

2025-03-16T19:49:40Z

← Older revision		Revision as of 15:49, 16 March 2025
Line 399:		Line 399:
	local normalizedRefiner = normalizeText(refinerNeeded)		local normalizedRefiner = normalizeText(refinerNeeded)
	local normalizedBuilding = normalizeText(buildingName)		local normalizedBuilding = normalizeText(buildingName)

	~~-- Debug: uncomment to see what's being compared~~
	~~-- if _ <= 3 then~~
	~~-- return "Row " .. _ .. ": Refiner = '" .. refinerNeeded .. "', Normalized = '" .. normalizedRefiner .. "', Building = '" .. normalizedBuilding .. "'"~~
	~~-- end~~

	if normalizedRefiner == normalizedBuilding then		if normalizedRefiner == normalizedBuilding then
Line 412:		Line 407:
	-- If no recipes found, return a message		-- If no recipes found, return a message
	if #matchingRecipes == 0 then		if #matchingRecipes == 0 then
	return '<tr><td colspan="4" style="text-align:center;">No refining recipes found for this building.</td></tr>'		return '<tr><td colspan="3" style="text-align:center;">No refining recipes found for this building.</td></tr>'
	end		end

			-- Start with the updated table headers
			local output = "<tr>\n" ..
			"<th>Output</th>\n" ..
			"<th>Ingredients</th>\n" ..
			"<th>Craft Time</th>\n" ..
			"</tr>\n"

	-- Generate table rows for each recipe		-- Generate table rows for each recipe
	~~local output = ""~~
	for _, recipe in ipairs(matchingRecipes) do		for _, recipe in ipairs(matchingRecipes) do
	local outputItem = recipe[nameCol] or ""		local outputItem = recipe[nameCol] or ""
Line 432:		Line 433:
	end		end

	-- Format ~~cells~~ with ~~icons for resources~~		-- Format the output item with icon, including quantity
	local formattedOutput = p.iconize({args = {[1] = outputItem}})		local formattedOutput = p.iconize({args = {[1] = outputItem}})
	local formattedIngredients = p.iconize({args = {[1] = ~~ingredients~~}})		if qty ~= "1" then
			formattedOutput = formattedOutput .. " × " .. qty
			end

			-- Split ingredients by semicolon and format each with icon
			local formattedIngredients = ""
			if ingredients ~= "" then
			local ingredientsList = mw.text.split(ingredients, ";")
			for i, ingredient in ipairs(ingredientsList) do
			local trimmedIngredient = mw.text.trim(ingredient)
			if trimmedIngredient ~= "" then
			local formattedIngredient = p.iconize({args = {[1] = trimmedIngredient}})
			if i > 1 then
			formattedIngredients = formattedIngredients .. "<br>"
			end
			formattedIngredients = formattedIngredients .. formattedIngredient
			end
			end
			end

	-- Add table row		-- Add table row
Line 441:		Line 460:
	"<td>" .. formattedIngredients .. "</td>\n" ..		"<td>" .. formattedIngredients .. "</td>\n" ..
	"<td style=\"text-align:center;\">" .. time .. "</td>\n" ..		"<td style=\"text-align:center;\">" .. time .. "</td>\n" ..
	~~"<td style=\"text-align:center;\">" .. qty .. "</td>\n" ..~~
	"</tr>\n"		"</tr>\n"
	end		end

Operator at 19:39, 16 March 2025

2025-03-16T19:39:50Z

← Older revision		Revision as of 15:39, 16 March 2025
Line 335:		Line 335:
	-- Function to display refining recipes for a building		-- Function to display refining recipes for a building
	----------------------------------------------------------------------		----------------------------------------------------------------------
			-- Function to display refining recipes for a building
	function p.getRefiningRecipes(frame)		function p.getRefiningRecipes(frame)
	local buildingName = frame.args[1] or mw.title.getCurrentTitle().text		local buildingName = frame.args[1] or mw.title.getCurrentTitle().text

	~~-- For debugging~~
	~~-- return "Looking for recipes for building: " .. buildingName~~

	-- Get refining data		-- Get refining data
Line 349:		Line 347:
	local rows = refiningData.rows		local rows = refiningData.rows

	-- ~~Get column~~ indices ~~(using hardcoded indices to match~~ the ~~table structure)~~		-- Fixed indices for the required columns
	local resourceClassCol = 1 -- Resource Class		local resourceClassCol = 1 -- Resource Class
	local nameCol = 2 -- Name		local nameCol = 2 -- Name
Line 355:		Line 353:
	local ingredientsCol = 4 -- Ingredients to Smelt		local ingredientsCol = 4 -- Ingredients to Smelt
	local recipeCol = 5 -- Recipe to Smelt		local recipeCol = 5 -- Recipe to Smelt
	local ~~refinerNeededCol~~ = 8 -- ~~Refiner Needed~~
			-- Helper function to find refiner name in a row
			local function getRefinerFromRow(row)
			-- Check potential positions for Refiner Needed column
			-- Try column 8 first (matches original table structure)
			if row[8] and row[8] ~= "" then
			return row[8]
			-- Try column 6 next (as seen in debug output)
			elseif row[6] and row[6] ~= "" then
			return row[6]
			-- As a fallback, try each column from the end
			else
			for i = #row, 1, -1 do
			if row[i] and row[i] ~= "" then
			return row[i]
			end
			end
			end
			return ""
			end

	-- Helper function to normalize text for comparison		-- Helper function to normalize text for comparison
Line 371:		Line 388:

	return text		return text
	~~end~~

	~~-- Helper function to check if a building name is in a semicolon-separated list~~
	~~local function isInList(list, name)~~
	~~-- Normalize the name we're looking for~~
	~~name = normalizeText(name)~~

	~~-- Split the list by semicolons~~
	~~for _, item in ipairs(mw.text.split(list, ";")) do~~
	~~-- Normalize each item and compare~~
	~~if normalizeText(item) == name then~~
	~~return true~~
	~~end~~
	~~end~~

	~~return false~~
	end		end

Line 392:		Line 393:
	local matchingRecipes = {}		local matchingRecipes = {}
	for _, row in ipairs(rows) do		for _, row in ipairs(rows) do
	-- ~~Check if~~ the ~~Refiner Needed column contains~~ the ~~building name~~		-- Get the refiner name from the row
	local refinerNeeded = row~~[refinerNeededCol] or ""~~		local refinerNeeded = getRefinerFromRow(row)

			-- Normalize both texts for comparison
			local normalizedRefiner = normalizeText(refinerNeeded)
			local normalizedBuilding = normalizeText(buildingName)

	-- Debug ~~output for the first few rows~~		-- Debug: uncomment to see what's being compared
	-- if _ <= 3 then		-- if _ <= 3 then
	-- return "Row " .. _ .. ": " .. refinerNeeded .. ", ~~Looking for:~~ " .. ~~buildingName~~ ..		-- return "Row " .. _ .. ": Refiner = '" .. refinerNeeded .. "', Normalized = '" .. normalizedRefiner .. "', Building = '" .. normalizedBuilding .. "'"
	-- ", ~~Normalized:~~ " .. ~~normalizeText(refinerNeeded)~~ ..
	-- "~~, IsInList:~~ " ~~.. tostring(isInList(refinerNeeded, buildingName))~~
	-- end		-- end

	if ~~isInList(refinerNeeded, buildingName)~~ then		if normalizedRefiner == normalizedBuilding then
	table.insert(matchingRecipes, row)		table.insert(matchingRecipes, row)
	end		end

Operator at 19:31, 16 March 2025

2025-03-16T19:31:56Z

@@ Line 254: / Line 254: @@
 end
 -- Function to display refining recipes for a building
 function p.getRefiningRecipes(frame)
      local buildingName = frame.args[1] or mw.title.getCurrentTitle().text
@@ Line 360: / Line 440: @@
                  "<td style=\"text-align:center;\">" .. qty .. "</td>\n" ..
                  "</tr>\n"
      end

Operator at 19:19, 16 March 2025

2025-03-16T19:19:53Z

@@ Line 257: / Line 257: @@
 function p.getRefiningRecipes(frame)
      local buildingName = frame.args[1] or mw.title.getCurrentTitle().text
      -- Get refining data
@@ Line 273: / Line 276: @@
      local recipeCol = 5        -- Recipe to Smelt
      local refinerNeededCol = 8 -- Refiner Needed
      -- Find recipes matching the building name
      local matchingRecipes = {}
      for _, row in ipairs(rows) do
-         -- Check if the Refiner Needed column matches the building name
+         -- Check if the Refiner Needed column contains the building name
          local refinerNeeded = row[refinerNeededCol] or ""
-         -- Extract the refiner name from the wiki link format [[Name]]
+         -- Debug output for the first few rows
-         local refinerName = refinerNeeded:match("%[%[(.-)%]%]") or refinerNeeded
+         -- if _ <= 3 then
-        -- Compare with the requested building name
+         if isInList(refinerNeeded, buildingName) then
              table.insert(matchingRecipes, row)
          end