Module:Room features: Difference between revisions

Browse history interactively

Content added Content deleted

Inline

@@ Line 13: / Line 13: @@
 }
-function base_query(location, category)
+function base_query(location)
-	return {
+	local ret = {
 		'[[Has subobject::<q>[[Located in::' .. location .. ']]</q>]]',
-		'[[Category:' .. category,
 		'?#-',
 		'?Name',
-		'?Image#-',
+		'?Image#-'
 	}
+	for _,cat in ipairs(categories) do
+		table.insert(ret, string.format('?Category:%s=%s', cat, cat))
+	end
+	return ret
 end
@@ Line 28: / Line 31: @@
 	local location = args[1] or mw.title.getCurrentTitle()
+	local query = mw.smw.ask(base_query(location))
-	for _,cat in ipairs(categories) do
+	if query ~= nil then
-		local query = mw.smw.ask(base_query(location, cat))
+		local results_by_type = {}
-		if query ~= nil then
+		for i,v in ipairs(query) do
-			ret = ret .. '===' .. cat .. '===\n'
+			for _,cat in ipairs(categories) do
+				if i == 1 then
-			local gallery = '<gallery>\n'
+					results_by_type[cat] = {}
-			for i,v in ipairs(query or {}) do
+				end
-				gallery = gallery .. (v.Image or 'File:Section anchor light.svg') .. '|' .. '[[' .. v[1] .. '|' .. v.Name .. ']]\n'
+				if v[cat] == true then
+					table.insert(results_by_type[cat], v)
+				end
+			end
+		end
+		for cat,v in pairs(results_by_type) do
+			if #v > 0 then
+				ret = ret .. '===' .. cat .. '===\n'
+				local gallery = '<gallery>\n'
+				for i,v in ipairs(query or {}) do
+					gallery = gallery .. (v.Image or 'File:Section anchor light.svg') .. '|' .. '[[' .. v[1] .. '|' .. v.Name .. ']]\n'
+				end
+				gallery = gallery .. '</gallery>\n\n'
+				mw.log(gallery)
+				ret = ret .. gallery
 			end
-			gallery = gallery .. '</gallery>\n\n'
-			mw.log(gallery)
-			ret = ret .. frame:preprocess(gallery)
 		end
 	end
-	return ret
+	return frame:preprocess(ret)
 end

Module:Room features: Difference between revisions

Navigation menu