Module:Namespace detect/data - Revision history

WikiSysop: 15 revisions

2014-11-17T18:05:14Z

15 revisions

Mr. Stradivarius: bug fix - use the demospace parameter as both key and value in the argKeys table

2014-04-05T17:02:16Z

bug fix - use the demospace parameter as both key and value in the argKeys table

Mr. Stradivarius: use "demopage" instead of "page" as the default page parameter - needed to fix bug on en.wikisource where "Page" is a namespace name

2014-04-05T05:40:57Z

use "demopage" instead of "page" as the default page parameter - needed to fix bug on en.wikisource where "Page" is a namespace name

Mr. Stradivarius: Protected Module:Namespace detect/data: High-risk Lua module ([Edit=Allow only administrators] (indefinite) [Move=Allow only administrators] (indefinite))

2014-03-24T11:45:45Z

Protected Module:Namespace detect/data: High-risk Lua module ([Edit=Allow only administrators] (indefinite) [Move=Allow only administrators] (indefinite))

Mr. Stradivarius: found it - mappings[nsname] was getting an upper-case key

2014-03-24T11:43:58Z

found it - mappings[nsname] was getting an upper-case key

Mr. Stradivarius: Undid revision 601018314 by Mr. Stradivarius (talk) looks like that broke something

2014-03-24T11:37:34Z

Undid revision 601018314 by Mr. Stradivarius (talk) looks like that broke something

Mr. Stradivarius: avoid using local variables to save table lookups per Jackmcbarn's suggestion, and because this will be cached with mw.loadData so performance of this function is not such a worry

2014-03-24T11:36:17Z

avoid using local variables to save table lookups per Jackmcbarn's suggestion, and because this will be cached with mw.loadData so performance of this function is not such a worry

Mr. Stradivarius: give the argKeys table global scope so that getParamMappings can access it without having to process the cfg table again

2014-03-22T07:03:48Z

give the argKeys table global scope so that getParamMappings can access it without having to process the cfg table again

Mr. Stradivarius: add a getArgKeys function, so that we can have multiple keys for each argument (helpful for localisation) and so that we only have to create that table once per page

2014-03-22T06:41:09Z

add a getArgKeys function, so that we can have multiple keys for each argument (helpful for localisation) and so that we only have to create that table once per page

Jackmcbarn: Undid revision 600634263 by Jackmcbarn (talk): Oh, this seems to have been for performance. Still not sure if it's a good idea, but will leave for now

2014-03-21T19:06:53Z

Undid revision 600634263 by Jackmcbarn (talk): Oh, this seems to have been for performance. Still not sure if it's a good idea, but will leave for now

@@ Line 18: / Line 18: @@
 -- values can be added as a string, or as an array of strings.
-local argKeys = {
+local defaultKeys = {
-	main = {'main'},
+	'main',
-	talk = {'talk'},
+	'talk',
-	other = {'other'},
+	'other',
-	subjectns = {'subjectns'},
+	'subjectns',
-	demospace = {'demospace'},
+	'demospace',
-	page = {'demopage'}
+	'demopage'
+}
 for defaultKey, t in pairs(argKeys) do

@@ Line 24: / Line 24: @@
 	subjectns = {'subjectns'},
 	demospace = {'demospace'},
-	page = {'page'}
+	page = {'demopage'}
+}

@@ Line 52: / Line 52: @@
 	-- }
 	--]]
 	local mappings = {}
-	mappings[ustringLower(subjectNamespaces[0].name)] = clone(argKeys.main)
+	local mainNsName = mw.site.subjectNamespaces[0].name
-	mappings['talk'] = clone(argKeys.talk)
+	mainNsName = mw.ustring.lower(mainNsName)
-	for nsid, ns in pairs(subjectNamespaces) do
+	mappings[mainNsName] = mw.clone(argKeys.main)
 		if nsid ~= 0 then -- Exclude main namespace.
-			local nsname = ustringLower(ns.name)
+			local nsname = mw.ustring.lower(ns.name)
-			local canonicalName = ustringLower(ns.canonicalName)
+			local canonicalName = mw.ustring.lower(ns.canonicalName)
 			mappings[nsname] = {nsname}
 			if canonicalName ~= nsname then
-				tinsert(mappings[nsname], canonicalName)
+				table.insert(mappings[nsname], canonicalName)
 			end
 			for _, alias in ipairs(ns.aliases) do
-				tinsert(mappings[nsname], ustringLower(alias))
+				table.insert(mappings[nsname], mw.ustring.lower(alias))
 			end
 		end

@@ Line 52: / Line 52: @@
 	-- }
 	--]]
 	local mappings = {}
-	local mainNsName = mw.site.subjectNamespaces[0].name
+	mappings[ustringLower(subjectNamespaces[0].name)] = clone(argKeys.main)
-	mainNsName = mw.ustring.lower(mainNsName)
+	mappings['talk'] = clone(argKeys.talk)
-	mappings[mainNsName] = mw.clone(argKeys.main)
+	for nsid, ns in pairs(subjectNamespaces) do
 		if nsid ~= 0 then -- Exclude main namespace.
-			local nsname = ns.name
+			local nsname = ustringLower(ns.name)
-			local canonicalName = ns.canonicalName
+			local canonicalName = ustringLower(ns.canonicalName)
-			mappings[nsname] = {mw.ustring.lower(nsname)}
+			mappings[nsname] = {nsname}
 			if canonicalName ~= nsname then
-				table.insert(mappings[nsname], mw.ustring.lower(canonicalName))
+				tinsert(mappings[nsname], canonicalName)
 			end
 			for _, alias in ipairs(ns.aliases) do
-				table.insert(mappings[nsname], mw.ustring.lower(alias))
+				tinsert(mappings[nsname], ustringLower(alias))
 			end
 		end

@@ Line 52: / Line 52: @@
 	-- }
 	--]]
 	local mappings = {}
-	mappings[ustringLower(subjectNamespaces[0].name)] = clone(argKeys.main)
+	local mainNsName = mw.site.subjectNamespaces[0].name
-	mappings['talk'] = clone(argKeys.talk)
+	mainNsName = mw.ustring.lower(mainNsName)
-	for nsid, ns in pairs(subjectNamespaces) do
+	mappings[mainNsName] = mw.clone(argKeys.main)
 		if nsid ~= 0 then -- Exclude main namespace.
-			local nsname = ustringLower(ns.name)
+			local nsname = ns.name
-			local canonicalName = ustringLower(ns.canonicalName)
+			local canonicalName = ns.canonicalName
-			mappings[nsname] = {nsname}
+			mappings[nsname] = {mw.ustring.lower(nsname)}
 			if canonicalName ~= nsname then
-				tinsert(mappings[nsname], canonicalName)
+				table.insert(mappings[nsname], mw.ustring.lower(canonicalName))
 			end
 			for _, alias in ipairs(ns.aliases) do
-				tinsert(mappings[nsname], ustringLower(alias))
+				table.insert(mappings[nsname], mw.ustring.lower(alias))
 			end
 		end

← Older revision	Revision as of 18:05, 17 November 2014
(No difference)

← Older revision	Revision as of 11:45, 24 March 2014
(No difference)

@@ Line 13: / Line 13: @@
 end
-local function getArgKeys()
+-- Get a table of parameters to query for each default parameter name.
-	-- Returns a table of parameters to query for each default parameter name.
+-- This allows wikis to customise parameter names in the cfg table while
-	-- This allows wikis to customise parameter names in the cfg table while
+-- ensuring that default parameter names will always work. The cfg table
-	-- ensuring that default parameter names will always work. The cfg table
+-- values can be added as a string, or as an array of strings.
-	-- values can be added as a string, or as an array of strings.
-	local argKeys = {
+local argKeys = {
-		main = {'main'},
+	main = {'main'},
-		talk = {'talk'},
+	talk = {'talk'},
-		other = {'other'},
+	other = {'other'},
-		subjectns = {'subjectns'},
+	subjectns = {'subjectns'},
-		demospace = {'demospace'},
+	demospace = {'demospace'},
-		page = {'page'}
+	page = {'page'}
-−
+}
-	for defaultKey, t in pairs(argKeys) do
-		local cfgValue = cfg[defaultKey]
+for defaultKey, t in pairs(argKeys) do
-		local cfgValueType = type(cfgValue)
+	local cfgValue = cfg[defaultKey]
-		if cfgValueType == 'string' then
+	local cfgValueType = type(cfgValue)
-			addKey(t, cfgValue, defaultKey)
+	if cfgValueType == 'string' then
-		elseif cfgValueType == 'table' then
+		addKey(t, cfgValue, defaultKey)
-			for i, key in ipairs(cfgValue) do
+	elseif cfgValueType == 'table' then
-				addKey(t, key, defaultKey)
+		for i, key in ipairs(cfgValue) do
-			end
+			addKey(t, key, defaultKey)
 		end
 	end
-	return argKeys
+	cfg[defaultKey] = nil -- Free the cfg value as we don't need it any more.
 end
@@ Line 55: / Line 54: @@
 	local ustringLower = mw.ustring.lower
 	local tinsert = table.insert
 	local subjectNamespaces = mw.site.subjectNamespaces
 	local mappings = {}
-	mappings[ustringLower(subjectNamespaces[0].name)] = {cfg.main}
+	mappings[ustringLower(subjectNamespaces[0].name)] = clone(argKeys.main)
-	mappings[talk] = {talk}
+	mappings['talk'] = clone(argKeys.talk)
 	for nsid, ns in pairs(subjectNamespaces) do
 		if nsid ~= 0 then -- Exclude main namespace.
@@ Line 77: / Line 76: @@
 return {
-	argKeys = getArgKeys(),
+	argKeys = argKeys,
 	cfg = cfg,
 	mappings = getParamMappings()
+}

@@ Line 6: / Line 6: @@
 local cfg = require('Module:Namespace detect/config')
 local function getParamMappings()
@@ Line 42: / Line 76: @@
 end
-return {cfg = cfg, mappings = getParamMappings()}
+return {