Module:DataTableParserV2 - Revision history

Operator at 05:49, 1 April 2025

2025-04-01T05:49:33Z

← Older revision		Revision as of 01:49, 1 April 2025
Line 524:		Line 524:
	if line ~= "" then		if line ~= "" then
	local withIcon = p.iconize({ args = { line } })		local withIcon = p.iconize({ args = { line } })
	table.insert(formatted, ~~"<li>" ..~~ withIcon ~~.. "</li>"~~)		table.insert(formatted, withIcon)
	end		end
	end		end
Line 530:		Line 530:
	return table.concat(formatted, "<br>")		return table.concat(formatted, "<br>")
	end		end

Operator at 05:33, 1 April 2025

2025-04-01T05:33:34Z

← Older revision		Revision as of 01:33, 1 April 2025
Line 528:		Line 528:
	end		end

	return ~~"<ul style='margin:0; padding-left: 1.2em;'>" ..~~ table.concat(formatted, ~~"") ..~~ "<~~/ul~~>"		return table.concat(formatted, "<br>")
	end		end

Operator at 05:29, 1 April 2025

2025-04-01T05:29:17Z

← Older revision		Revision as of 01:29, 1 April 2025
Line 506:		Line 506:
	local text = ""		local text = ""

	if type(frameOrText) == "table" then		-- Handle both direct string or frame.args
			if type(frameOrText) == "string" then
			text = frameOrText
			elseif type(frameOrText) == "table" then
	text = frameOrText.args and frameOrText.args[1] or ""		text = frameOrText.args and frameOrText.args[1] or ""
	~~else~~
	~~text = tostring(frameOrText)~~
	end		end

Line 523:		Line 524:
	if line ~= "" then		if line ~= "" then
	local withIcon = p.iconize({ args = { line } })		local withIcon = p.iconize({ args = { line } })
	table.insert(formatted, withIcon)		table.insert(formatted, "<li>" .. withIcon .. "</li>")
	end		end
	end		end

	return table.concat(formatted, "<br>")		return "<ul style='margin:0; padding-left: 1.2em;'>" .. table.concat(formatted, "") .. "</ul>"
	end		end

Operator at 04:58, 1 April 2025

2025-04-01T04:58:56Z

← Older revision		Revision as of 00:58, 1 April 2025
Line 521:		Line 521:
	for _, raw in ipairs(components) do		for _, raw in ipairs(components) do
	local line = mw.text.trim(raw)		local line = mw.text.trim(raw)
	~~local name, qty~~ = ~~line:match(~~"~~%[%[([^%]]+)%]%]%s[xX]%s(%d+)~~")		if line ~= "" then
	~~if name and qty~~ then		local withIcon = p.iconize({ args = { line } })
	local ~~icon~~ = ~~getResourceIcon(name)~~		table.insert(formatted, withIcon)
	~~table.insert(formatted, icon .. " [[" .. name .. "]] × " .. qty)~~
	~~else~~
	~~table.insert(formatted,~~ p.iconize({ args = { ~~[1] =~~ line } }))
	end		end
	end		end
Line 532:		Line 529:
	return table.concat(formatted, "<br>")		return table.concat(formatted, "<br>")
	end		end

Operator at 04:54, 1 April 2025

2025-04-01T04:54:24Z

← Older revision		Revision as of 00:54, 1 April 2025
Line 503:		Line 503:
	-- Outputs format for multiple recipe lines		-- Outputs format for multiple recipe lines
	--------------------------------------------------------------------------------		--------------------------------------------------------------------------------
	function p.formatRecipeList(text)		function p.formatRecipeList(frameOrText)
			local text = ""

			if type(frameOrText) == "table" then
			text = frameOrText.args and frameOrText.args[1] or ""
			else
			text = tostring(frameOrText)
			end

	if not text or text == "" then		if not text or text == "" then
	return ""		return ""
Line 513:		Line 521:
	for _, raw in ipairs(components) do		for _, raw in ipairs(components) do
	local line = mw.text.trim(raw)		local line = mw.text.trim(raw)
	~~-- Try to extract link + quantity like [[Copper Ore]] x 4~~
	local name, qty = line:match("%[%[([^%]]+)%]%]%s[xX]%s(%d+)")		local name, qty = line:match("%[%[([^%]]+)%]%]%s[xX]%s(%d+)")
	if name and qty then		if name and qty then
Line 519:		Line 526:
	table.insert(formatted, icon .. " [[" .. name .. "]] × " .. qty)		table.insert(formatted, icon .. " [[" .. name .. "]] × " .. qty)
	else		else
	~~-- Fallback to iconize plain line~~		table.insert(formatted, p.iconize({ args = { [1] = line } }))
	table.insert(formatted, p.iconize({args = {[1] = line}}))
	end		end
	end		end
Line 526:		Line 532:
	return table.concat(formatted, "<br>")		return table.concat(formatted, "<br>")
	end		end

Operator at 04:37, 1 April 2025

2025-04-01T04:37:56Z

← Older revision		Revision as of 00:37, 1 April 2025
Line 254:		Line 254:
	end		end

	local formattedIngredients = ""		local formattedIngredients = p.formatRecipeList(ingredients)
	~~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~~

	output = output .. "<tr>\n" ..		output = output .. "<tr>\n" ..

Operator at 04:35, 1 April 2025

2025-04-01T04:35:41Z

@@ Line 509: / Line 509: @@
      return output
 end
 return p

Operator at 19:04, 30 March 2025

2025-03-30T19:04:41Z

← Older revision		Revision as of 15:04, 30 March 2025
Line 66:		Line 66:
	-- Uses ExternalData (via the parser function) to fetch building data from data_buildings.		-- Uses ExternalData (via the parser function) to fetch building data from data_buildings.
	--------------------------------------------------------------------------------		--------------------------------------------------------------------------------
			local function splitBySeparator(input, sep)
			local result = {}
			local pos = 1
			while true do
			local i, j = input:find(sep, pos, true)
			if not i then
			table.insert(result, mw.text.trim(input:sub(pos)))
			break
			end
			table.insert(result, mw.text.trim(input:sub(pos, i - 1)))
			pos = j + 1
			end
			return result
			end

	local function loadBuildingData(frame)		local function loadBuildingData(frame)
	local buildingName = frame.args[1] or frame.args.name or mw.title.getCurrentTitle().text		local buildingName = frame.args[1] or frame.args.name or mw.title.getCurrentTitle().text
Line 76:		Line 91:
	\|limit=1		\|limit=1
	\|format=plain		\|format=plain
	\|separator=\|\|		\|separator=\|\|
	}}		}}
	]], buildingName)		]], buildingName)

	local rawOutput = frame:preprocess(edQuery)		local rawOutput = mw.text.trim(frame:preprocess(edQuery))
	~~rawOutput = mw.text.trim(rawOutput~~)		if rawOutput == "" then
	if ~~not rawOutput or~~ rawOutput == "" then
	return nil, "No data found for building: " .. buildingName		return nil, "No data found for building: " .. buildingName
	end		end

	~~-- List of expected fields in order~~
	local fields = {		local fields = {
	"ID", "BuildingType", "Name", "Description", "PowerCost", "GeneratesPower",		"ID", "BuildingType", "Name", "Description", "PowerCost", "GeneratesPower",
Line 95:		Line 108:
	}		}

	~~-- Split the raw output by the separator "\|\|"~~		local values = splitBySeparator(rawOutput, "\|\|")
	local values = {}
	~~for value in string.gmatch~~(rawOutput, "~~([^\|][^\|]*)~~\|\|?") do
	~~table.insert(values, mw.text.trim(value))~~
	~~end~~

	if #values < #fields then		if #values < #fields then
	return nil, "Incomplete data returned for building: " .. buildingName		return nil, "Incomplete data returned for building: " .. buildingName

Operator at 18:59, 30 March 2025

2025-03-30T18:59:06Z

← Older revision		Revision as of 14:59, 30 March 2025
Line 71:		Line 71:
	{{#get_external_data: source=externaldb		{{#get_external_data: source=externaldb
	\|from=data_buildings		\|from=data_buildings
	\|data=ID=id,		\|data=ID=id,BuildingType=building_type,Name=name,Description=description,PowerCost=power_cost,GeneratesPower=generates_power,StorageSlots=storage_slots,StorageCapacity=storage_capacity,SchematicRequirement=schematic_requirement,JourneyRequirement=journey_requirement,Health=health,PlacedWith=placed_with,AdditionalNotes=additional_notes,RecipeToBuild=recipe_to_build,ImageFile=image_file,IconFile=icon_file,Category1=category_1,Category2=category_2,Category3=category_3,Gallery1=gallery_1,Gallery2=gallery_2,Gallery3=gallery_3,Gallery4=gallery_4,YoutubeVideoLink=youtube_video_link
	BuildingType=building_type,
	Name=name,
	Description=description,
	PowerCost=power_cost,
	GeneratesPower=generates_power,
	StorageSlots=storage_slots,
	StorageCapacity=storage_capacity,
	SchematicRequirement=schematic_requirement,
	JourneyRequirement=journey_requirement,
	Health=health,
	PlacedWith=placed_with,
	AdditionalNotes=additional_notes,
	RecipeToBuild=recipe_to_build,
	ImageFile=image_file,
	IconFile=icon_file,
	Category1=category_1,
	Category2=category_2,
	Category3=category_3,
	Gallery1=gallery_1,
	Gallery2=gallery_2,
	Gallery3=gallery_3,
	Gallery4=gallery_4,
	YoutubeVideoLink=youtube_video_link
	\|cache=yes		\|cache=yes
	\|where=name='%s'		\|where=name='%s'
	\|limit=1		\|limit=1
			\|format=plain
			\|separator=\|\|
	}}		}}
	]], buildingName)		]], buildingName)

	local ~~result~~ = frame:preprocess(edQuery)		local rawOutput = frame:preprocess(edQuery)
			rawOutput = mw.text.trim(rawOutput)
	~~-- Build a structure~~ for ~~the data based on expected field order~~.		if not rawOutput or rawOutput == "" then
	~~local buildingData = {}~~		return nil, "No data found for building: " .. buildingName
	~~local colMap = {}~~		end
	~~local fieldValues = {}~~
			-- List of expected fields in order
	local fields = {		local fields = {
	"ID", "BuildingType", "Name", "Description", "PowerCost", "GeneratesPower",		"ID", "BuildingType", "Name", "Description", "PowerCost", "GeneratesPower",
Line 115:		Line 94:
	"Gallery3", "Gallery4", "YoutubeVideoLink"		"Gallery3", "Gallery4", "YoutubeVideoLink"
	}		}

			-- Split the raw output by the separator "\|\|"
			local values = {}
			for value in string.gmatch(rawOutput, "([^\|][^\|]*)\|\|?") do
			table.insert(values, mw.text.trim(value))
			end

			if #values < #fields then
			return nil, "Incomplete data returned for building: " .. buildingName
			end

			local colMap = {}
	for i, field in ipairs(fields) do		for i, field in ipairs(fields) do
	colMap[field] = i		colMap[field] = i
	~~local value = frame:preprocess("{{{" .. field .. "}}}")~~
	~~if value and value ~= "" and value ~= "{{{" .. field .. "}}}" then~~
	~~fieldValues[i] = value~~
	~~else~~
	~~fieldValues[i] = ""~~
	~~end~~
	~~end~~

	~~local hasData = false~~
	~~for _, v in ipairs(fieldValues) do~~
	~~if v ~= "" then~~
	~~hasData = true~~
	~~break~~
	~~end~~
	~~end~~

	~~if not hasData then~~
	~~return nil, "No data found for building: " .. buildingName~~
	end		end

	buildingData.colMap = colMap		local buildingData = { colMap = colMap, rows = { values } }
	~~buildingData.~~rows = { ~~fieldValues~~ }

	return buildingData, nil		return buildingData, nil
	end		end


	--------------------------------------------------------------------------------		--------------------------------------------------------------------------------

Operator at 18:52, 30 March 2025

2025-03-30T18:52:00Z

Show changes