Module:CargoQuery: Difference between revisions

← Older edit

Module:CargoQuery (view source)

Revision as of 01:03, 4 February 2024

97 bytes added , 4 February

no edit summary

Teamtoto

Bureaucrats, Interface administrators, Suppressors, Administrators

8,756

edits

@@ Line 11: / Line 11: @@
 function p.main(frame)
 	local args = h.merge()
-	local query = {}
-	for k, v in pairs(args) do
-		if string.sub(k, 0, 2) == 'q?' then
-			local key = string.sub(k, 3)
-			 query[PARAM_LOOKUP[key] or key] = v
-		elseif PARAM_LOOKUP[k] then
-			query[PARAM_LOOKUP[k]] = v
-		else
-			query[k] = v
-		end
-	end
-	if args.one_to_many then
-		query.fields = query.fields .. ',' .. query.one_to_many
-	end
-	local result = mw.ext.cargo.query(query.tables, query.fields, query)
-	if #result == 0 then
-		return frame:preprocess(args.default or '')
-	end
-	if args.one_to_many then
-		result = h.groupOneToManyFields(result, h.getOneToManyTableFromArgs(args))
-		h.concatOneToManyFieldsInEachRow(result, args.one_to_many_sep or ',')
-	end
-	local tbl = {}
-	for i, row in ipairs(result) do
-		row.index = i
-		tbl[#tbl+1] = frame:expandTemplate{ title = args.template, args = row }
-	end
 	local intro = frame:preprocess(args.intro or '')
 	local outro = frame:preprocess(args.outro or '')
+	local template = frame:preprocess(args.template or 'single query result')
 	local delimiter = args.delimiter or ''
@@ Line 49: / Line 20: @@
 	local format = args.format or nil
-	if colcount ~= nil then
+	result = p.query(args)
-		intro = (intro .. '<div style="-webkit-column-count:' ..
+	if (result == args.default or result == '') then
+		return result
+	end
+	local tbl = {}
+	if format == "table" then
+		return (intro .. tostring(h.makeTable(result)) .. outro)
+	else
+		for i, row in ipairs(result) do
+			row.index = i
+			tbl[#tbl+1] = frame:expandTemplate{ title = template, args = row }
+		end
+		if colcount ~= nil then
+			intro = (intro .. '<div style="-webkit-column-count:' ..
 			     colcount .. '; -moz-column-count:' ..
 				 colcount .. '; column-count:' .. colcount .. ';">')
-		outro = '</div>' ..outro
+			outro = '</div>' ..outro
+		end
+		if format == "ul" then
+			intro = intro .. "<ul><li>"
+			outro = "</ul>" .. outro
+			delimiter = "<li>"
+		end
+		return intro .. table.concat(tbl, delimiter) .. outro
 	end
-	if format == "ul" then
-		intro = intro .. "<ul><li>"
-		outro = "</ul>" .. outro
-		delimiter = "<li>"
-	end
-	return intro .. table.concat(tbl, delimiter) .. outro
 end
@@ Line 197: / Line 181: @@
 	template = frame:preprocess(args['template'] or '')
 	if template == nil or template == '' then
-     		error('A template must be specified!')
+     		template='single query result'
 	end
 	delimiter = frame:preprocess(args['delimiter'] or '')
@@ Line 213: / Line 197: @@
      		tempresult = p.query(b)
      		if tempresult ~= nil and tempresult ~= '' then
-         		result[#result+1] = p.query(b)
+         		result[#result+1] = tempresult
      		end
 	end
+	if result == args.default or result == '' then
+		return result
+	end
 	resulttbl = util_table.mergeArrays(nil, unpack(result))
 	local tbl = {}
@@ Line 228: / Line 216: @@
 	local outro = frame:preprocess(args['outro'] or '')
 	return intro  .. table.concat(tbl, delimiter) .. outro
+end
+function h.getColNames(row)
+	cols = {}
+	for colname, _ in pairs(row)do
+		table.insert(cols, colname)
+	end
+	return cols
+end
+function h.makeTable(result)
+	local util_html = require'Module:HTML Utility'
+    local tbl = mw.html.create('table')
+        :addClass('wikitable')
+    colNames = h.getColNames(result[1])
+    util_html.printHeader(tbl, colNames)
+    util_html.printRowsByList(tbl, result, colNames)
+    return tbl
 end
 return p