Module:Arraymap2 - Bewerkingsoverzicht

Admin op 22 sep 2023 om 18:14

2023-09-22T18:14:33Z

← Oudere versie		Versie van 22 sep 2023 18:14
Regel 72:		Regel 72:
	--local res = mw.text.unstrip( res )		--local res = mw.text.unstrip( res )
	--local res = mw.text.killMarkers( res )		--local res = mw.text.killMarkers( res )
	local res = frame:preprocess( res )		--local res = frame:preprocess( res )
	-- local res = frame:preprocess( mw.text.unstrip( newVals ) )		-- local res = frame:preprocess( mw.text.unstrip( newVals ) )
	return res		return res

2023-09-22T18:14:08Z

← Oudere versie		Versie van 22 sep 2023 18:14
Regel 72:		Regel 72:
	--local res = mw.text.unstrip( res )		--local res = mw.text.unstrip( res )
	--local res = mw.text.killMarkers( res )		--local res = mw.text.killMarkers( res )
	--local res = frame:preprocess( res )		local res = frame:preprocess( res )
	-- local res = frame:preprocess( mw.text.unstrip( newVals ) )		-- local res = frame:preprocess( mw.text.unstrip( newVals ) )
	return res		return res

2023-09-22T18:12:49Z

← Oudere versie		Versie van 22 sep 2023 18:12
Regel 25:		Regel 25:
	local varstr = frame.args.varstr or mw.text.trim(frame.args[3]) or "@@@"		local varstr = frame.args.varstr or mw.text.trim(frame.args[3]) or "@@@"
	local map = frame.args.map or mw.text.trim(frame.args[4]) or ""		local map = frame.args.map or mw.text.trim(frame.args[4]) or ""
	--local map = mw.text.nowiki( map )		local map = mw.text.nowiki( map )
	--optional		--optional
	local outputsep = frame.args.outputsep or frame.args[5] or ""		local outputsep = frame.args.outputsep or frame.args[5] or ""

2023-09-22T14:17:18Z

← Oudere versie		Versie van 22 sep 2023 14:17
Regel 72:		Regel 72:
	--local res = mw.text.unstrip( res )		--local res = mw.text.unstrip( res )
	--local res = mw.text.killMarkers( res )		--local res = mw.text.killMarkers( res )
	local res = frame:preprocess( res )		--local res = frame:preprocess( res )
	-- local res = frame:preprocess( mw.text.unstrip( newVals ) )		-- local res = frame:preprocess( mw.text.unstrip( newVals ) )
	return res		return res

2023-09-22T14:16:21Z

← Oudere versie		Versie van 22 sep 2023 14:16
Regel 25:		Regel 25:
	local varstr = frame.args.varstr or mw.text.trim(frame.args[3]) or "@@@"		local varstr = frame.args.varstr or mw.text.trim(frame.args[3]) or "@@@"
	local map = frame.args.map or mw.text.trim(frame.args[4]) or ""		local map = frame.args.map or mw.text.trim(frame.args[4]) or ""
	--local map = mw.text.nowiki( map )		--local map = mw.text.nowiki( map )
	--optional		--optional
	local outputsep = frame.args.outputsep or frame.args[5] or ""		local outputsep = frame.args.outputsep or frame.args[5] or ""
Regel 59:		Regel 59:
	--nothing		--nothing
	else		else
	local mapUnstripped = mw.text.unstripNoWiki( map )		--local mapUnstripped = mw.text.unstripNoWiki( map )
	local newVal = string.gsub( ~~mapUnstripped~~, varstr, v )		local newVal = string.gsub( map, varstr, v )
	--local newVal = mw.text.killMarkers( newVal )		--local newVal = mw.text.killMarkers( newVal )
	--local newVal = frame:preprocess( newVal )		--local newVal = frame:preprocess( newVal )

2023-09-22T14:15:38Z

← Oudere versie		Versie van 22 sep 2023 14:15
Regel 25:		Regel 25:
	local varstr = frame.args.varstr or mw.text.trim(frame.args[3]) or "@@@"		local varstr = frame.args.varstr or mw.text.trim(frame.args[3]) or "@@@"
	local map = frame.args.map or mw.text.trim(frame.args[4]) or ""		local map = frame.args.map or mw.text.trim(frame.args[4]) or ""
	local map = mw.text.nowiki( map )		--local map = mw.text.nowiki( map )
	--optional		--optional
	local outputsep = frame.args.outputsep or frame.args[5] or ""		local outputsep = frame.args.outputsep or frame.args[5] or ""

2023-09-22T14:15:20Z

← Oudere versie		Versie van 22 sep 2023 14:15
Regel 21:		Regel 21:
	--mandatory		--mandatory
	local vals = frame.args.vals or mw.text.trim(frame.args[1]) or ""		local vals = frame.args.vals or mw.text.trim(frame.args[1]) or ""
	local vals = mw.text.nowiki( vals )		--local vals = mw.text.nowiki( vals )
	local sep = frame.args.sep or mw.text.trim(frame.args[2]) or ","		local sep = frame.args.sep or mw.text.trim(frame.args[2]) or ","
	local varstr = frame.args.varstr or mw.text.trim(frame.args[3]) or "@@@"		local varstr = frame.args.varstr or mw.text.trim(frame.args[3]) or "@@@"

2023-09-22T14:15:03Z

← Oudere versie		Versie van 22 sep 2023 14:15
Regel 59:		Regel 59:
	--nothing		--nothing
	else		else
	local mapUnstripped = mw.text.~~unstrip~~( map )		local mapUnstripped = mw.text.unstripNoWiki( map )
	local newVal = string.gsub( mapUnstripped, varstr, v )		local newVal = string.gsub( mapUnstripped, varstr, v )
	--local newVal = mw.text.killMarkers( newVal )		--local newVal = mw.text.killMarkers( newVal )

2023-09-22T14:14:36Z

← Oudere versie		Versie van 22 sep 2023 14:14
Regel 77:		Regel 77:
	end		end

	~~--[[~~
	~~Convert escaped syntax, esp. for SMW~~
	~~]]--~~
	~~p.convertescaped = function( str )~~
	~~-- example %{%{#ask: ((Has name::...)) %Has name %link=none %}%}~~
	~~-- for ((Has name::...)), alternative %[%[ ... %]%]~~
	~~local conversionTable = {~~
	~~["%%{%%{"] = "{{", -- %{%{~~
	~~["%%}%%}"] = "}}", -- %}%}~~
	~~["%%[%%["] = "[[", -- %[%[~~
	~~["%%]%%]"] = "]]", -- %]%]~~
	~~["%(%("] = "[[", -- (( alternative~~
	~~["%)%)"] = "]]", -- )) alternative~~
	~~["%%"] = "\|"~~
	}
	~~--str = string.gsub( str, "%S+", conversionTable )~~
	~~--for k,v in ipairs( conversionTable ) do~~
	~~-- str = string.gsub( str, k, v )~~
	~~--end~~
	~~local str = string.gsub( str, "%%{%%{", "{{" )~~
	~~local str = string.gsub( str, "%%}%%}", "}}" )~~
	~~--local str = string.gsub( str, "%[%[", "[[" )~~
	~~--local str = string.gsub( str, "%]%]", "]]" )~~
	~~--local str = string.gsub( str, "%(%(", "[[" )~~
	~~--local str = string.gsub( str, "%)%)", "]]" )~~
	~~local str = string.gsub( str, "%%", "\|" )~~

	~~return str~~
	~~end~~

	return p		return p

2023-09-22T14:14:12Z

← Oudere versie		Versie van 22 sep 2023 14:14
Regel 59:		Regel 59:
	--nothing		--nothing
	else		else
	local newVal = string.gsub( ~~map~~, varstr, v )		local mapUnstripped = mw.text.unstrip( map )
			local newVal = string.gsub( mapUnstripped, varstr, v )
	--local newVal = mw.text.killMarkers( newVal )		--local newVal = mw.text.killMarkers( newVal )
	--local newVal = frame:preprocess( newVal )		--local newVal = frame:preprocess( newVal )
Regel 69:		Regel 70:

	local res = table.concat( mappedTable, outputsep )		local res = table.concat( mappedTable, outputsep )
	local res = mw.text.unstrip( res )		--local res = mw.text.unstrip( res )
	local res = mw.text.killMarkers( res )		--local res = mw.text.killMarkers( res )
	local res = frame:preprocess( res )		local res = frame:preprocess( res )
	-- local res = frame:preprocess( mw.text.unstrip( newVals ) )		-- local res = frame:preprocess( mw.text.unstrip( newVals ) )