Module:CargoQuery: Difference between revisions

160 bytes removed ,  00:46, 2 September 2020
m
no edit summary
mNo edit summary
mNo edit summary
Line 1: Line 1:
local util_args = require('Module:Args Utility')
local util_args = require('Module:Args Utility')
local process_args = require('Module:ProcessArgs')
local process_args = require('Module:ProcessArgs')
local util_table = require('Module:Table Utility')


local PARAM_LOOKUP = {
local PARAM_LOOKUP = {
Line 164: Line 165:
end
end


resulttbl = util_table.merge(result[1], result[2])
local tbl = {}
local tbl = {}
for i, row in ipairs(result[1]) do
for i, row in ipairs(resulttbl) do
row.index = i
row.index = i
tbl[#tbl+1] = frame:expandTemplate{ title = args['template'], args = row }
tbl[#tbl+1] = frame:expandTemplate{ title = args['template'], args = row }
end
part1 = table.concat(tbl,args['delimiter'] or '')
local tbl2 = {}
for j, rowj in ipairs(result2) do
row.index = i
tbl2[#tbl2+1] = frame:expandTemplate{ title = args['template'], args = row }
end
end


local intro = frame:preprocess(args['intro'] or '')
local intro = frame:preprocess(args['intro'] or '')
local outro = frame:preprocess(args['outro'] or '')
local outro = frame:preprocess(args['outro'] or '')
return intro .. (part1 or '') ..(#part1 > 0 and (args['delimiter'] or '')) .. table.concat(tbl2, args['delimiter'] or '') .. outro
return intro .. table.concat(tbl, args['delimiter'] or '') .. outro


end
end


return p
return p