Module:Data and Module:Data/sandbox: Difference between pages

Content deleted Content added

@@ Line 3: / Line 3: @@
 function mt.__index(t, k)
 	return function(frame)
-		local data = mw.loadData(k)
+		local success, data = pcall(mw.loadData, k)
-		local i = 1
+		if not success then
+			success, data = pcall(mw.loadJsonData, k)
-		for _,v in ipairs(frame.args) do
+			if not success then
+				error("'" .. k .. "' is not a valid data page")
+			end
+		end
+		for i, v in ipairs(frame.args) do
 			local ty = type(data)
 			if ty ~= 'table' then
@@ Line 18: / Line 23: @@
 				end
 			end
-			data = data[v]
+			local nextdata = data[v]
+			if nextdata == nil and tonumber(v) then
-			i = i + 1
+				data = data[tonumber(v)]
+			else
+				data = nextdata
+			end
 		end
 		return data