Module:CountryData - Revision history

GKFX: Add optional caching layer for most-used templates via loadData. Reduces rendering time as tested on List_of_twin_towns_and_sister_cities_in_Germany

2021-05-05T20:40:05Z

Add optional caching layer for most-used templates via loadData. Reduces rendering time as tested on List_of_twin_towns_and_sister_cities_in_Germany

← Previous revision		Revision as of 20:40, 5 May 2021
Line 1:		Line 1:
	local p = {}		local p = {}
			local mostUsed = mw.loadData('Module:CountryData/summary')

	local function getcontents(frame,country,params)		local function getcontents(frame,country,params)
	return frame:expandTemplate({title="Country data "..country;args=params})		return frame:expandTemplate({title="Country data "..country;args=params})
			end

			function p.getcachedtable(frame, country, params)
			country = mostUsed.redirects[country] or country
			if params and next(params) then return p.gettable(frame, country, params) end
			-- Uses mw.loadData to cache data for the most-used templates
			if mostUsed.pages[country] then
			local cache = mw.loadData('Module:CountryData/cache' .. mostUsed.pages[country])
			if cache.data[country] then return cache.data[country] end
			end
			-- if not in cache
			return p.gettable(frame, country, params)
	end		end

SiBr4: Fixing for data templates with safesubst:

2020-05-05T18:28:16Z

Fixing for data templates with safesubst:

← Previous revision		Revision as of 18:28, 5 May 2020
Line 9:		Line 9:
	--If not a valid data template, return empty table		--If not a valid data template, return empty table
	local bool, s = pcall(getcontents,frame,country,params or {})		local bool, s = pcall(getcontents,frame,country,params or {})
	if bool and string.find(s,"^%{%{ *%{%{%{1")		if bool and (string.find(s,"^%{%{ %{%{%{1") or string.find(s,"^%{%{safesubst: %{%{%{1"))
	then		then
	--Replace parameter delimiters with arbitrary control characters		--Replace parameter delimiters with arbitrary control characters

Ferret: Protected "Module:CountryData": Highly visible template ([Edit=Require template editor access] (indefinite) [Move=Require template editor access] (indefinite))

2017-03-21T16:42:07Z

Protected "Module:CountryData": Highly visible template ([Edit=Require template editor access] (indefinite) [Move=Require template editor access] (indefinite))

← Previous revision	Revision as of 16:42, 21 March 2017
(No difference)

SiBr4: Global to local function (see my talk)

2017-03-14T19:57:17Z

Global to local function (see my talk)

← Previous revision		Revision as of 19:57, 14 March 2017
Line 1:		Line 1:
	local p = {}		local p = {}

	function getcontents(frame,country,params)		local function getcontents(frame,country,params)
	return frame:expandTemplate({title="Country data "..country;args=params})		return frame:expandTemplate({title="Country data "..country;args=params})
	end		end

SiBr4: Use pcall to have to load the data template only once instead of twice

2016-03-28T16:56:12Z

Use pcall to have to load the data template only once instead of twice

← Previous revision		Revision as of 16:56, 28 March 2016
Line 1:		Line 1:
	local p = {}		local p = {}

			function getcontents(frame,country,params)
		⚫	return frame:expandTemplate({title="Country data "..country;args=params})
			end

	function p.gettable(frame,country,params)		function p.gettable(frame,country,params)
	--Returns the parameters of a country data template as a Lua table		--Returns the parameters of a country data template as a Lua table
	--If not a valid data template, return empty table		--If not a valid data template, return empty table
			local bool, s = pcall(getcontents,frame,country,params or {})
	if string.find(frame:preprocess("{{Country data "..country.."}}"),"^%{%{ *%{%{%{1")
			if bool and string.find(s,"^%{%{ *%{%{%{1")
	then		then
	--Params to be passed into data template
	params = params or {}
	--Transclude template without first parameter for string list of params
⚫	~~local s =~~ frame:expandTemplate({title="Country data "..country;args=params})
	--Replace parameter delimiters with arbitrary control characters		--Replace parameter delimiters with arbitrary control characters
	--to avoid clashes if param values contain equals/pipe signs		--to avoid clashes if param values contain equals/pipe signs

SiBr4: Don't pass through empty flag alias

2016-01-27T18:18:41Z

Don't pass through empty flag alias

← Previous revision		Revision as of 18:18, 27 January 2016
Line 19:		Line 19:
	local k = string.match(par,"\1%s(.-)%s\2")		local k = string.match(par,"\1%s(.-)%s\2")
	local v = string.match(par,"\2%s(.-)%s\1")		local v = string.match(par,"\2%s(.-)%s\1")
			if v and not (v=="" and string.find(k,"^flag alias")) then
	part[k] = v		part[k] = v
			end
	end		end
	return part		return part

SiBr4: Adding parameters

2015-09-02T13:55:47Z

Adding parameters

← Previous revision		Revision as of 13:55, 2 September 2015
Line 30:		Line 30:
	--Returns a single parameter value from a data template		--Returns a single parameter value from a data template
	local part = p.gettable(frame,frame.args[1])		local part = p.gettable(frame,frame.args[1])
	~~return~~ ~~tostring(part[~~frame.args~~[2]])~~		if frame.args.variant
			then return tostring(part[frame.args[2].."-"..frame.args.variant]
			or part[frame.args[2]] or frame.args.def)
			else return tostring(part[frame.args[2]] or frame.args.def)
			end
	end		end

SiBr4 at 10:02, 21 August 2015

2015-08-21T10:02:53Z

← Previous revision		Revision as of 10:02, 21 August 2015
Line 1:		Line 1:
	local p = {}		local p = {}

	function gettable(frame,country,params)		function p.gettable(frame,country,params)
	--Returns the parameters of a country data template as a Lua table		--Returns the parameters of a country data template as a Lua table
	--If not a valid data template, return empty table		--If not a valid data template, return empty table
Line 29:		Line 29:
	function p.getalias(frame)		function p.getalias(frame)
	--Returns a single parameter value from a data template		--Returns a single parameter value from a data template
	local part = gettable(frame,frame.args[1])		local part = p.gettable(frame,frame.args[1])
	return tostring(part[frame.args[2]])		return tostring(part[frame.args[2]])
	end		end
Line 36:		Line 36:
	--For testing, recreates the country data from the created Lua table		--For testing, recreates the country data from the created Lua table
	--Get data table		--Get data table
	local data = gettable(frame,frame.args[1])		local data = p.gettable(frame,frame.args[1])
	--Concatenate fields into a template-like string		--Concatenate fields into a template-like string
	local out = "{{ {{{1}}}"		local out = "{{ {{{1}}}"

SiBr4 at 09:28, 21 August 2015

2015-08-21T09:28:10Z

← Previous revision		Revision as of 09:28, 21 August 2015
Line 1:		Line 1:
			local p = {}

	function gettable(frame,country,params)		function gettable(frame,country,params)
	--Returns the parameters of a country data template as a Lua table		--Returns the parameters of a country data template as a Lua table
Line 42:		Line 44:
	return out.."\n}}"		return out.."\n}}"
	end		end

			return p

SiBr4: Moved from my sandbox

2015-08-21T09:25:59Z

Moved from my sandbox

New page

function gettable(frame,country,params)
--Returns the parameters of a country data template as a Lua table
--If not a valid data template, return empty table
if string.find(frame:preprocess("{{Country data "..country.."}}"),"^%{%{ *%{%{%{1")
then
--Params to be passed into data template
params = params or {}
--Transclude template without first parameter for string list of params
local s = frame:expandTemplate({title="Country data "..country;args=params})
--Replace parameter delimiters with arbitrary control characters
--to avoid clashes if param values contain equals/pipe signs
s = string.gsub(s,"|([^|=]-)=","\1\1%1\2")
s = string.gsub(s,"}}%s*$","\1")
--Loop over string and add params to table
local part = {}
for par in string.gmatch(s,"\1[^\1\2]-\2[^\1\2]-\1") do
local k = string.match(par,"\1%s*(.-)%s*\2")
local v = string.match(par,"\2%s*(.-)%s*\1")
part[k] = v
end
return part
else
return {}
end
end

function p.getalias(frame)
--Returns a single parameter value from a data template
local part = gettable(frame,frame.args[1])
return tostring(part[frame.args[2]])
end

function p.gettemplate(frame)
--For testing, recreates the country data from the created Lua table
--Get data table
local data = gettable(frame,frame.args[1])
--Concatenate fields into a template-like string
local out = "{{ {{{1}}}"
for k,v in pairs(data) do
out = out.."\n| "..k.." = "..v
end
return out.."\n}}"
end