Module:Rail-interchange multi/sandbox - Revision history

Lemondoge: Simplification & efficiency improvement, bug fix

2023-05-09T18:53:54Z

Simplification & efficiency improvement, bug fix

← Previous revision		Revision as of 18:53, 9 May 2023
Line 17:		Line 17:
	end		end
	for i2, v2 in ipairs(tmp) do		for i2, v2 in ipairs(tmp) do
	if i2 < 5 then		if i2 == 1 then
		⚫	args[i2] = (string.find((v2 or ''), '^%s*$') and default or v2)
	if i2 == 1 then
	args[i2] = (string.find((v2 or ''), '^%s*$') and ~~default~~ or v2)		elseif i2 < 5 then
			args[i2] = (not string.find((v2 or ''), '^%s*$') and v2 or nil)
	else		else
		⚫	break
⚫	args[i2] = (string.find((v2 or ''), '^%s*$') and ~~nil~~ or v2)
⚫	~~end~~
	end		end
	end		end
Line 53:		Line 53:
	end		end
	for i2, v2 in ipairs(tmp) do		for i2, v2 in ipairs(tmp) do
	if i2 < 5 then		if i2 == 1 then
		⚫	args[i2] = (string.find((v2 or ''), '^%s*$') and default or v2)
	if i2 == 1 then
	args[i2] = (string.find((v2 or ''), '^%s*$') and ~~default~~ or v2)		elseif i2 < 5 then
			args[i2] = (not string.find((v2 or ''), '^%s*$') and v2 or nil)
	else		else
		⚫	break
⚫	args[i2] = (string.find((v2 or ''), '^%s*$') and ~~nil~~ or v2)
⚫	~~end~~
	end		end
	end		end

Jc86035: test

2019-09-23T01:21:54Z

test

← Previous revision		Revision as of 01:21, 23 September 2019
Line 19:		Line 19:
	if i2 < 5 then		if i2 < 5 then
	if i2 == 1 then		if i2 == 1 then
	args[i2] = ((v2 == '' and ~~nil~~ or v2~~) or default~~)		args[i2] = (string.find((v2 or ''), '^%s*$') and default or v2)
	else		else
	args[i2] = (v2 == '' and nil or v2)		args[i2] = (string.find((v2 or ''), '^%s*$') and nil or v2)
	end		end
	end		end
Line 55:		Line 55:
	if i2 < 5 then		if i2 < 5 then
	if i2 == 1 then		if i2 == 1 then
	args[i2] = ((v2 == '' and ~~nil~~ or v2~~) or default~~)		args[i2] = (string.find((v2 or ''), '^%s*$') and default or v2)
	if i1 == 2 then return args[i2] end
	else		else
	args[i2] = (v2 == '' and nil or v2)		args[i2] = (string.find((v2 or ''), '^%s*$') and nil or v2)
	end		end
	end		end

Jc86035: test

2019-09-23T01:18:58Z

test

← Previous revision		Revision as of 01:18, 23 September 2019
Line 56:		Line 56:
	if i2 == 1 then		if i2 == 1 then
	args[i2] = ((v2 == '' and nil or v2) or default)		args[i2] = ((v2 == '' and nil or v2) or default)
			if i1 == 2 then return args[i2] end
	else		else
	args[i2] = (v2 == '' and nil or v2)		args[i2] = (v2 == '' and nil or v2)
Line 67:		Line 68:
	end		end
	result = '<div style="display:table-cell;vertical-align:middle;padding-left:3px;white-space:nowrap">' .. result .. '</div>'		result = '<div style="display:table-cell;vertical-align:middle;padding-left:3px;white-space:nowrap">' .. result .. '</div>'
	return ~~default~~		return result
	end		end

Jc86035: test

2019-09-23T01:17:55Z

test

← Previous revision		Revision as of 01:17, 23 September 2019
Line 12:		Line 12:
	local tmp = mw.text.split(v1, '\\')		local tmp = mw.text.split(v1, '\\')
	if i1 == 1 then		if i1 == 1 then
	default = ~~mw.clone(~~tmp[1])		default = tmp[1]
	else		else
	sep = ' '		sep = ' '
Line 48:		Line 48:
	local tmp = mw.text.split(v1, '\\')		local tmp = mw.text.split(v1, '\\')
	if i1 == 1 then		if i1 == 1 then
	default = ~~mw.clone(~~tmp[1])		default = tmp[1]
	else		else
	sep = sep_code[i1 % 2]		sep = sep_code[i1 % 2]
Line 67:		Line 67:
	end		end
	result = '<div style="display:table-cell;vertical-align:middle;padding-left:3px;white-space:nowrap">' .. result .. '</div>'		result = '<div style="display:table-cell;vertical-align:middle;padding-left:3px;white-space:nowrap">' .. result .. '</div>'
	return ~~result~~		return default
	end		end

Jc86035: test

2019-09-23T01:15:26Z

test

← Previous revision		Revision as of 01:15, 23 September 2019
Line 4:		Line 4:
	local data = frame.args[1]		local data = frame.args[1]
	local div = frame.args['div']		local div = frame.args['div']
	local result, sep = '', ''		local result, sep, default = '', ''
⚫	~~local~~ data = mw.text.split(data, '+')
	local args = {}		local args = {}
		⚫	data = mw.text.split(data, '+')
	for i1, v1 in ipairs(data) do		for i1, v1 in ipairs(data) do
		⚫	args = {}
	if v1 ~= '' and v1 ~= '\\' then		if v1 ~= '' and v1 ~= '\\' then
	local tmp = mw.text.split(v1, '\\')		local tmp = mw.text.split(v1, '\\')
	if ~~args[1] then sep~~ = ' ~~' end~~		if i1 == 1 then
			default = mw.clone(tmp[1])
		⚫	else
			sep = ' '
		⚫	end
	for i2, v2 in ipairs(tmp) do		for i2, v2 in ipairs(tmp) do
	if i2 < 5 then		if i2 < 5 then
	if i2 == 1 then		if i2 == 1 then
	if ~~not~~ (v2 == '' or v2 == ~~nil~~) ~~then~~		args[i2] = ((v2 == '' and nil or v2) or default)
⚫	args~~[i2]~~ = v2
⚫	end
	else		else
	args[i2] = (v2 == '' and nil or v2)		args[i2] = (v2 == '' and nil or v2)
Line 27:		Line 30:
	end		end
	end		end
	if div == 'yes' or div == 'y' then result = '<div style="display: table-cell; vertical-align: middle; padding-left: 3px; white-space: nowrap;">' .. result .. '</div>' end		if div == 'yes' or div == 'y' then result = '<div style="display:table-cell;vertical-align:middle;padding-left:3px;white-space:nowrap">' .. result .. '</div>' end
	return result		return result
	end		end

⚫
	function p.doublerow(frame)		function p.doublerow(frame)
	local data = frame.args[1]		local data = frame.args[1]
	local result, sep = '', ''		local result, sep, default = '', ''
⚫	~~local~~ data = mw.text.split(data, '+')
	local args = {}		local args = {}
	local sep_code = {		local sep_code = {
	[0] = '<br/>',		[0] = '<br/>',
	[1] = '</div><div style="display: table-cell; vertical-align: middle; padding-left: 3px; white-space: nowrap;">'		[1] = '</div><div style="display:table-cell;vertical-align:middle;padding-left:3px;white-space:nowrap">'
	}		}
		⚫	data = mw.text.split(data, '+')
	for i1, v1 in ipairs(data) do		for i1, v1 in ipairs(data) do
		⚫	args = {}
	if v1 ~= '' and v1 ~= '\\' then		if v1 ~= '' and v1 ~= '\\' then
	local tmp = mw.text.split(v1, '\\')		local tmp = mw.text.split(v1, '\\')
	if ~~args[1] then sep~~ = ~~sep_code[i1~~ ~~% 2] end~~		if i1 == 1 then
			default = mw.clone(tmp[1])
			else
			sep = sep_code[i1 % 2]
		⚫	end
	for i2, v2 in ipairs(tmp) do		for i2, v2 in ipairs(tmp) do
	if i2 < 5 then		if i2 < 5 then
	if i2 == 1 then		if i2 == 1 then
	if ~~not~~ (v2 == '' or v2 == ~~nil~~) ~~then~~		args[i2] = ((v2 == '' and nil or v2) or default)
⚫	args~~[i2]~~ = v2
⚫	end
	else		else
	args[i2] = (v2 == '' and nil or v2)		args[i2] = (v2 == '' and nil or v2)
Line 60:		Line 66:
	end		end
	end		end
	result = '<div style="display: table-cell; vertical-align: middle; padding-left: 3px; white-space: nowrap;">' .. result .. '</div>'		result = '<div style="display:table-cell;vertical-align:middle;padding-left:3px;white-space:nowrap">' .. result .. '</div>'
	return result		return result
	end		end

Jc86035: fix frame

2019-09-21T17:12:55Z

fix frame

← Previous revision		Revision as of 17:12, 21 September 2019
Line 1:		Line 1:
	local p = {}		local p = {}

	local function rint(args)
	return frame:expandTemplate{ title = 'Rail-interchange', args = args }
	end

	function p.row(frame)		function p.row(frame)
Line 27:		Line 23:
	end		end
	if args[1] or args[2] then		if args[1] or args[2] then
	result = result .. sep .. ~~rint(~~args)		result = result .. sep .. frame:expandTemplate{ title = 'Rail-interchange', args = args }
	end		end
	end		end
Line 60:		Line 56:
	end		end
	if args[1] or args[2] then		if args[1] or args[2] then
	result = result .. sep .. ~~rint(~~args)		result = result .. sep .. frame:expandTemplate{ title = 'Rail-interchange', args = args }
	end		end
	end		end

Jc86035: fix

2019-09-21T17:12:09Z

fix

← Previous revision		Revision as of 17:12, 21 September 2019
Line 67:		Line 67:
	return result		return result
	end		end

			return p

Jc86035: rewrite

2019-09-21T17:11:45Z

rewrite

Show changes

Jc86035 at 14:06, 1 June 2015

2015-06-01T14:06:25Z

← Previous revision		Revision as of 14:06, 1 June 2015
Line 105:		Line 105:
	para4 = v2		para4 = v2
	end		end
	if para1_empty == true and para2 == nil then result = result .. sep		if para1_empty == true and para2 == nil then result = result .. sep
	else result = result .. sep .. frame:expandTemplate{ title = 'Rail-interchange', args = { para1, para2, para3, para4 } }		else result = result .. sep .. frame:expandTemplate{ title = 'Rail-interchange', args = { para1, para2, para3, para4 } }
	end		end
	end		end
	end		end

Jc86035 at 14:05, 1 June 2015

2015-06-01T14:05:00Z

← Previous revision		Revision as of 14:05, 1 June 2015
Line 46:		Line 46:
	para4 = v2		para4 = v2
	end		end
		⚫	if para1_empty == true and para2 == nil then
⚫	end
		⚫	else result = result .. sep .. frame:expandTemplate{ title = 'Rail-interchange', args = { para1, para2, para3, para4 } }
⚫	if para1_empty == true and para2 == nil then
		⚫	end
⚫	else result = result .. sep .. frame:expandTemplate{ title = 'Rail-interchange', args = { para1, para2, para3, para4 } }
	end		end
	end		end