Module:BrandSeries: Difference between revisions

Line 26:

end

-- Query all CRTs for this brand with their series~~, then count in Lua~~

-- Query all CRTs for this brand with their series using broadtable

local crtQuery = string.format(

'{{#ask:[[Category:CRT models]][[Has brand::%s]][[Has series::+]]|?Has series|format=~~list~~|link=none|limit=1000~~|sep=@@~~|searchlabel=}}',

'{{#ask:[[Category:CRT models]][[Has brand::%s]][[Has series::+]]|?Has series|format=broadtable|link=none|headers=hide|limit=1000|searchlabel=}}',

brand

)

local crtResult = frame:preprocess(crtQuery)

-- Count occurrences of each series

-- Count occurrences of each series by parsing HTML table

local seriesCounts = {}

if crtResult and crtResult ~= '' then

for ~~entry~~ in crtResult:gmatch('[^@@]+') do

-- Parse each table row

-- ~~Each entry is "PageName (SeriesName)"~~ - ~~extract series~~

for rowContent in crtResult:gmatch('<tr[^>]*>(.-)</tr>') do

local ~~series~~ = ~~entry~~:~~match~~('~~%s*%~~((.-)~~%)%s*$'~~)

local cells = {}

if ~~series~~ then

for cellContent in rowContent:gmatch('<td[^>]*>(.-)</td>') do

series = ~~trim(series)~~

-- Strip HTML tags

if series then

local cleanContent = cellContent:gsub('<[^>]+>', '')

table.insert(cells, trim(cleanContent))

end

-- cells[1] = page name, cells[2] = series

if #cells >= 2 and cells[2] then

local series = cells[2]

if series and series ~= '' then

seriesCounts[series] = (seriesCounts[series] or 0) + 1

end

Line 80:

Line 86:

-- Series link - build as HTML anchor

~~local seriesUrl = mw.uri.fullUrl(row.series)~~

local seriesLink = mw.html.create('a')

seriesLink:attr('href', '/wiki/' .. mw.uri.encode(row.series, 'WIKI'))

@@ Line 26: / Line 26: @@
 	end
-	-- Query all CRTs for this brand with their series, then count in Lua
+	-- Query all CRTs for this brand with their series using broadtable
 	local crtQuery = string.format(
-		'{{#ask:[[Category:CRT models]][[Has brand::%s]][[Has series::+]]|?Has series|format=list|link=none|limit=1000|sep=@@|searchlabel=}}',
+		'{{#ask:[[Category:CRT models]][[Has brand::%s]][[Has series::+]]|?Has series|format=broadtable|link=none|headers=hide|limit=1000|searchlabel=}}',
 		brand
 	)
 	local crtResult = frame:preprocess(crtQuery)
-	-- Count occurrences of each series
+	-- Count occurrences of each series by parsing HTML table
 	local seriesCounts = {}
 	if crtResult and crtResult ~= '' then
-		for entry in crtResult:gmatch('[^@@]+') do
+		-- Parse each table row
-			-- Each entry is "PageName (SeriesName)" - extract series
+		for rowContent in crtResult:gmatch('<tr[^>]*>(.-)</tr>') do
-			local series = entry:match('%s*%((.-)%)%s*$')
+			local cells = {}
-			if series then
+			for cellContent in rowContent:gmatch('<td[^>]*>(.-)</td>') do
-				series = trim(series)
+				-- Strip HTML tags
-				if series then
+				local cleanContent = cellContent:gsub('<[^>]+>', '')
+				table.insert(cells, trim(cleanContent))
+			end
+			-- cells[1] = page name, cells[2] = series
+			if #cells >= 2 and cells[2] then
+				local series = cells[2]
+				if series and series ~= '' then
 					seriesCounts[series] = (seriesCounts[series] or 0) + 1
 				end
@@ Line 80: / Line 86: @@
 		-- Series link - build as HTML anchor
-		local seriesUrl = mw.uri.fullUrl(row.series)
 		local seriesLink = mw.html.create('a')
 		seriesLink:attr('href', '/wiki/' .. mw.uri.encode(row.series, 'WIKI'))