Module:ISO 3166/sandbox - Revision history

Ahecht: Fail faster if parameter exists but is blank

2024-08-16T17:56:28Z

Fail faster if parameter exists but is blank

← Previous revision		Revision as of 17:56, 16 August 2024
Line 116:		Line 116:
	or '[[Category:Wikipedia page with obscure subdivision]]'		or '[[Category:Wikipedia page with obscure subdivision]]'

	if ~~not~~ code1 then		if (code1 or "") == "" then
	if mw.title.getCurrentTitle().namespace ~= 0 then catnocountry = '' end		if mw.title.getCurrentTitle().namespace ~= 0 then catnocountry = '' end
	return catnocountry, '<span style="font-size:100%" class="error">"No parameter for the country given"</span>'		return catnocountry, '<span style="font-size:100%" class="error">"No parameter for the country given"</span>'
	end		end

	if ~~not~~ code2 then --3166-1 code		if (code2 or "") == "" then --3166-1 code
	for alpha2,cdata in pairs(data) do		for alpha2,cdata in pairs(data) do
	if findname(alpha2,cdata,code1) then		if findname(alpha2,cdata,code1) then

Ahecht: formatting

2024-08-16T17:44:24Z

formatting

← Previous revision		Revision as of 17:44, 16 August 2024
Line 103:		Line 103:

	function p.luacode(args)		function p.luacode(args)

	local code1 = p.strip(args[1])		local code1 = p.strip(args[1])
	local code2 = p.strip(args[2])		local code2 = p.strip(args[2])

Ahecht: Move validity test to inside p.strip, unstripnowiki

2024-08-16T17:19:22Z

Move validity test to inside p.strip, unstripnowiki

← Previous revision		Revision as of 17:19, 16 August 2024
Line 54:		Line 54:

	function p.strip(text)		function p.strip(text)
			if not text then return nil end

	local accents = {["À"]="A",["Á"]="A",["Â"]="A",["Ã"]="A", -- accent list		local accents = {["À"]="A",["Á"]="A",["Â"]="A",["Ã"]="A", -- accent list
	["Ä"]="A",["Å"]="A",["Ç"]="C",["È"]="E",["É"]="E",		["Ä"]="A",["Å"]="A",["Ç"]="C",["È"]="E",["É"]="E",
Line 70:		Line 72:
	}		}

			text = mw.text.unstripNoWiki(text) -- Remove <nowiki> tags
	text = mw.ustring.upper(text) -- Case insensitivity		text = mw.ustring.upper(text) -- Case insensitivity
	text = mw.ustring.gsub(text,"[À-Ý]",accents) -- Deaccent		text = mw.ustring.gsub(text,"[À-Ý]",accents) -- Deaccent
Line 100:		Line 103:

	function p.luacode(args)		function p.luacode(args)
	~~if args[1] then~~ code1 = p.strip(args[1]) ~~end~~		local code1 = p.strip(args[1])
	~~if args[2] then~~ code2 = p.strip(args[2]) ~~end~~		local code2 = p.strip(args[2])

	if args["codetype"]=="3" then args["codetype"]="alpha3" end		if args["codetype"]=="3" then args["codetype"]="alpha3" end

Ahecht: fix "GB-ENG-Greenwich"

2024-08-16T15:24:10Z

fix "GB-ENG-Greenwich"

← Previous revision		Revision as of 15:24, 16 August 2024
Line 148:		Line 148:
	end		end
	end		end
		⚫	end
		⚫	if string.find(args[2] or '',"%-") then
			code1, args[2] = string.match(args[2] or '',"^([^%-])%-(.)$")
			args[1] = args[1].."-"..code1
		⚫	return p.luacode(args)
	end		end
	if mw.title.getCurrentTitle().namespace ~= 0 then catnosubdivision = '' end		if mw.title.getCurrentTitle().namespace ~= 0 then catnosubdivision = '' end
	return catnosubdivision		return catnosubdivision
	end		end
			end
⚫	if string.find(args[1] or '',"%-") then
	~~args[1] =~~ string.~~match~~(args[1] or '',"~~^([^~~%-~~])%-(.)$~~")		if string.find(args[1] or '',"%-") then
			args[1] = string.match(args[1] or '',"^([^%-])%-(.)$")
⚫	return p.luacode(args)
			return p.luacode(args)
⚫	end
	end		end
	if mw.title.getCurrentTitle().namespace ~= 0 then catnocountry = '' end		if mw.title.getCurrentTitle().namespace ~= 0 then catnocountry = '' end

Ahecht: Fix GB-ENG-Greenwich

2024-08-16T14:19:12Z

Fix GB-ENG-Greenwich

← Previous revision		Revision as of 14:19, 16 August 2024
Line 129:		Line 129:
	if string.find(args[1] or '',"%-") then		if string.find(args[1] or '',"%-") then
	args[1], args[2] = string.match(args[1] or '',"^([^%-])%-(.)$")		args[1], args[2] = string.match(args[1] or '',"^([^%-])%-(.)$")
	return p.luacode(args)		if args[2] then return p.luacode(args) end
	end		end
	if mw.title.getCurrentTitle().namespace ~= 0 then catnocountry = '' end		if mw.title.getCurrentTitle().namespace ~= 0 then catnocountry = '' end
Line 151:		Line 151:
	if mw.title.getCurrentTitle().namespace ~= 0 then catnosubdivision = '' end		if mw.title.getCurrentTitle().namespace ~= 0 then catnosubdivision = '' end
	return catnosubdivision		return catnosubdivision
			end
			if string.find(args[1] or '',"%-") then
			args[1] = string.match(args[1] or '',"^([^%-])%-(.)$")
			return p.luacode(args)
	end		end
	end		end

Ahecht: Fix Module talk:ISO 3166#Guinea-Bissau error

2024-08-16T14:03:27Z

Fix Module talk:ISO 3166#Guinea-Bissau error

← Previous revision		Revision as of 14:03, 16 August 2024
Line 100:		Line 100:

	function p.luacode(args)		function p.luacode(args)
		⚫	if args[1] then code1 = p.strip(args[1]) end
		⚫	if args[2] then code2 = p.strip(args[2]) end

	if ~~string.find(~~args[1] or ~~'',~~"%-") ~~then~~		if args["codetype"]=="3" then args["codetype"]="alpha3" end
⚫	args[1], args[2] = string.match(args[1] or '',"^([^%-])%-(.)$")
⚫	end

⚫	if args[1] then ~~args[1]~~ = p.strip(args[1]) end
⚫	if args[2] then ~~args[2]~~ = p.strip(args[2]) end

	if args["codetype"]=="3" then
	args["codetype"]="alpha3"
	end

	local eot = args.error or ""		local eot = args.error or ""
Line 119:		Line 112:
	or '[[Category:Wikipedia page with obscure subdivision]]'		or '[[Category:Wikipedia page with obscure subdivision]]'

	if not ~~args[1]~~ then		if not code1 then
	if mw.title.getCurrentTitle().namespace ~= 0 then catnocountry = '' end		if mw.title.getCurrentTitle().namespace ~= 0 then catnocountry = '' end
	return catnocountry, '<span style="font-size:100%" class="error">"No parameter for the country given"</span>'		return catnocountry, '<span style="font-size:100%" class="error">"No parameter for the country given"</span>'
	end		end

	if not ~~args[2]~~ then --3166-1 code		if not code2 then --3166-1 code
	for alpha2,cdata in pairs(data) do		for alpha2,cdata in pairs(data) do
	if findname(alpha2,cdata,~~args[1]~~) then		if findname(alpha2,cdata,code1) then
	if args["codetype"]=="numeric" or args["codetype"]=="alpha3" then		if args["codetype"]=="numeric" or args["codetype"]=="alpha3" then
	return cdata[args["codetype"]]		return cdata[args["codetype"]]
Line 133:		Line 126:
	end		end
	end		end
		⚫	end
			if string.find(args[1] or '',"%-") then
		⚫	args[1], args[2] = string.match(args[1] or '',"^([^%-])%-(.)$")
			return p.luacode(args)
	end		end
	if mw.title.getCurrentTitle().namespace ~= 0 then catnocountry = '' end		if mw.title.getCurrentTitle().namespace ~= 0 then catnocountry = '' end
Line 138:		Line 135:
	else --3166-2 code		else --3166-2 code
	for alpha2,cdata in pairs(data) do		for alpha2,cdata in pairs(data) do
	if findname(alpha2,cdata,~~args[1]~~) then		if findname(alpha2,cdata,code1) then
	if mw.ustring.match(alpha2,"GB") then -- For England, Wales etc.		if mw.ustring.match(alpha2,"GB") then -- For England, Wales etc.
	alpha2 = "GB"		alpha2 = "GB"
Line 147:		Line 144:
	if type(scdata)=="table" then		if type(scdata)=="table" then
	empty = false		empty = false
	if findname(scode,scdata,~~args[2]~~) then		if findname(scode,scdata,code2) then
	return alpha2.."-"..scode		return alpha2.."-"..scode
	end		end

Frietjes: test

2022-07-26T20:13:02Z

test

Show changes

Wqnvlz: Properly suppress category

2022-04-02T00:10:47Z

Properly suppress category

← Previous revision		Revision as of 00:10, 2 April 2022
Line 211:		Line 211:
	end		end

	if mw.title.getCurrentTitle().namespace ~= 0 then ~~catnocountry = '' end~~		if mw.title.getCurrentTitle().namespace ~= 0 then
	return '', catnocountry..catnosubdivision		return ''
			else
			return '', catnocountry..catnosubdivision
			end

	end		end

Wqnvlz: Handle multiple hyphens

2022-04-02T00:08:54Z

Handle multiple hyphens

@@ Line 105: / Line 105: @@
 -- Returns tuple (code,errorcat,errortext). code is empty string upon error because MW stops at first nil
 function p.luacode(args)
 	local function luacodeimpl(args)
@@ Line 111: / Line 116: @@
 		if args["codetype"]=="3" then
 			args["codetype"]="alpha3"
 		end
@@ Line 166: / Line 161: @@
 	local a1,a2 = args[1],args[2]
-	local hyphenPos = string.find(a1 or '', '-', 1, true)
+	if not a1 or a1 == '' then
 	if not hyphenPos then														--no hyphen
 		return luacodeimpl(args)
 	end
-	args[1] = a1:sub(1, hyphenPos-1)											--Try splitting on hyphen
+	args[1] = a1:sub(1, hyphenPos-1)											--Split on first
 	args[2] = a1:sub(hyphenPos+1)
 	local result = luacodeimpl(args)
@@ Line 178: / Line 192: @@
 	end
-	args[1],args[2] = a1,a2														--Try again without splitting
+	args[1],args[2] = a1,a2														--Don't split
 end

Wqnvlz: Make luacodeimpl() a subfunction (past or present tense summaries??)

2022-04-01T23:29:59Z

Make luacodeimpl() a subfunction (past or present tense summaries??)

@@ Line 105: / Line 105: @@
 -- Returns tuple (code,errorcat,errortext). code is empty string upon error because MW stops at first nil
 function p.luacode(args)
 	if args[1] then args[1] = p.strip(args[1]) end
@@ Line 125: / Line 180: @@
 	args[1],args[2] = a1,a2														--Try again without splitting
 	return luacodeimpl(args)
 end