Module:Category handler - Revision history

WikiSysop: 19 revisions

2014-11-17T18:04:56Z

19 revisions

Mr. Stradivarius: allow invocations specifying the page parameter to use the mw.loadData optimisations, and don't call mw.title.new every time

2014-07-22T05:08:26Z

allow invocations specifying the page parameter to use the mw.loadData optimisations, and don't call mw.title.new every time

WOSlinker: apply changes from sandbox as requested by User:Jackmcbarn which removes middleclass dependency

2014-07-13T17:57:16Z

apply changes from sandbox as requested by User:Jackmcbarn which removes middleclass dependency

Mr. Stradivarius: Rewrite this using Module:Middleclass. It is now more efficient: it only parses parameters when necessary, and caches data with mw.loadData where it can.

2014-07-13T09:12:24Z

Rewrite this using Module:Middleclass. It is now more efficient: it only parses parameters when necessary, and caches data with mw.loadData where it can.

Show changes

Mr. Stradivarius: Protected Module:Category handler: High-risk Lua module ([Edit=Protected template] (indefinite) [Move=Protected template] (indefinite))

2013-10-20T10:48:14Z

Protected Module:Category handler: High-risk Lua module ([Edit=Protected template] (indefinite) [Move=Protected template] (indefinite))

Mr. Stradivarius: use live version of Module:Namespace detect

2013-10-20T10:42:36Z

use live version of Module:Namespace detect

Mr. Stradivarius: use the _main function for nsDetect rather than the main function

2013-10-15T14:11:53Z

use the _main function for nsDetect rather than the main function

Mr. Stradivarius: test the sandbox version of Module:Namespace detect

2013-10-15T14:10:19Z

test the sandbox version of Module:Namespace detect

Mr. Stradivarius: pass the demospace parameter to Module:Namespace detect

2013-09-27T13:05:07Z

pass the demospace parameter to Module:Namespace detect

Mr. Stradivarius: hmm, looks like the computer I was editing this on doesn't like the negation symbol

2013-09-26T12:54:27Z

hmm, looks like the computer I was editing this on doesn't like the negation symbol

@@ Line 55: / Line 55: @@
 	do
 		local pagename = obj:parameter('demopage')
-		local success, titleObj = pcall(mw.title.new, pagename)
+		local success, titleObj
 		if success and titleObj then
 			obj.title = titleObj
 		else
 			obj.title = mw.title.getCurrentTitle()

@@ Line 15: / Line 15: @@
 -- Load required modules
 local yesno = require('Module:Yesno')
@@ Line 47: / Line 46: @@
 --------------------------------------------------------------------------------
-local CategoryHandler = class('CategoryHandler')
+local CategoryHandler = {}
-function CategoryHandler:initialize(data, args)
+function CategoryHandler.new(data, args)
-	self._data = data
+	local obj = setmetatable({ _data = data, _args = args }, CategoryHandler)
 	-- Set the title object
 	do
-		local pagename = self:parameter('demopage')
+		local pagename = obj:parameter('demopage')
 		local success, titleObj = pcall(mw.title.new, pagename)
 		if success and titleObj then
-			self.title = titleObj
+			obj.title = titleObj
 		else
-			self.title = mw.title.getCurrentTitle()
+			obj.title = mw.title.getCurrentTitle()
-			self._usesCurrentTitle = true
+			obj._usesCurrentTitle = true
 		end
 	end
@@ Line 67: / Line 66: @@
 	-- Set suppression parameter values
 	for _, key in ipairs{'nocat', 'categories'} do
-		local value = self:parameter(key)
+		local value = obj:parameter(key)
 		value = trimWhitespace(value, true)
-		self['_' .. key] = yesno(value)
+		obj['_' .. key] = yesno(value)
 	end
 	do
-		local subpage = self:parameter('subpage')
+		local subpage = obj:parameter('subpage')
-		local category2 = self:parameter('category2')
+		local category2 = obj:parameter('category2')
 		if type(subpage) == 'string' then
 			subpage = mw.ustring.lower(subpage)
@@ Line 80: / Line 79: @@
 			subpage = mw.ustring.lower(category2)
 		end
-		self._subpage = trimWhitespace(subpage, true)
+		obj._subpage = trimWhitespace(subpage, true)
-		self._category2 = trimWhitespace(category2) -- don't remove blank values
+		obj._category2 = trimWhitespace(category2) -- don't remove blank values
 	end
 end
@@ Line 239: / Line 239: @@
 function p._main(args, data)
 	data = data or mw.loadData('Module:Category handler/data')
-	local handler = CategoryHandler:new(data, args)
+	local handler = CategoryHandler.new(data, args)
 	if handler:isSuppressed() then
 		return nil

@@ Line 95: / Line 95: @@
 -- Get dependent modules
-local nsDetect = require('Module:Namespace detect/sandbox') -- REMOVE "/sandbox" BEFORE GOING LIVE
+local nsDetect = require('Module:Namespace detect')
 local yesno = require('Module:Yesno')

@@ Line 206: / Line 206: @@
              ndargs.page = args.page
              ndargs.demospace = args.demospace
-             local ndresult = nsDetect.main(ndargs)
+             local ndresult = nsDetect._main(ndargs)
              if ndresult then
                  ret = ret .. ndresult
@@ Line 229: / Line 229: @@
              ndargs.demospace = args.demospace
-             local data = nsDetect.main(ndargs)
+             local data = nsDetect._main(ndargs)
              -- Work out what to return based on the result of the namespace detect call.

@@ Line 95: / Line 95: @@
 -- Get dependent modules
-local nsDetect = require('Module:Namespace detect')
+local nsDetect = require('Module:Namespace detect/sandbox') -- REMOVE "/sandbox" BEFORE GOING LIVE
 local yesno = require('Module:Yesno')

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

← Older revision	Revision as of 10:48, 20 October 2013
(No difference)

@@ Line 205: / Line 205: @@
              end
              ndargs.page = args.page
              local ndresult = nsDetect.main(ndargs)
              if ndresult then
@@ Line 212: / Line 213: @@
              -- Namespace parameters exist; advanced usage.
              -- If the all parameter is specified, return it.
-             if args.all then
+             local all = args.all
-                 ret = ret .. args.all
+            if type(all) == 'string' then
              end
@@ Line 223: / Line 225: @@
                  end
              end
-             if args.other then
+             ndargs.other = args.other
-                ndargs.other = args.other
+             ndargs.page = args.page
-             end
+            ndargs.demospace = args.demospace
              local data = nsDetect.main(ndargs)
@@ Line 238: / Line 237: @@
                  -- Remove non-positive integer values, as only positive integers
                  -- from 1-10 were used with the old template.
-                 if datanum > 0
+                 if datanum > 0 and math.floor(datanum) == datanum then
-                    and math.floor(datanum) == datanum
+                     local dataArg = args[datanum]
-                     and args[datanum] then
+                    if type(dataArg) == 'string' then
-                    ret = ret .. args[datanum]
+                        ret = ret .. dataArg
                  end
              else

@@ Line 40: / Line 40: @@
 cfg.category2 = 'category2'
 cfg.category2Yes = 'yes'
-cfg.category2Negative = 'Ê'
+cfg.category2Negative = '¬'
 -- cfg.subpage is the parameter name to specify how to behave on subpages. cfg.subpageNo is the value to