Module:Jct/city/sandbox - Revision history

Philroc at 03:04, 27 August 2021

2021-08-27T03:04:07Z

← Previous revision		Revision as of 03:04, 27 August 2021
Line 25:		Line 25:
	end		end

	local function generateText(num)		local function generateText(num, insertPrefix)
	local parts		local parts
	if ~~num == 1~~ then		if insertPrefix then
	~~parts~~ = ~~{"–~~ "}		if num == 1 then
			parts = {"– "}
	else
	parts = {", "}		else
			parts = {", "}
			end
	end		end

Line 72:		Line 74:

	local jctString = "{{jct/sandbox\|" .. ".+" .. place .. ".+" .. "}}"		local jctString = "{{jct/sandbox\|" .. ".+" .. place .. ".+" .. "}}"
	local linkString = generateText(num)		local linkString = generateText(num, false)

	local firstPosition = strfind(page, linkString)		local firstPosition = strfind(page, linkString)
Line 84:		Line 86:
	end		end

	return generateText(num)		return generateText(num, true)
	end		end

2021-08-26T21:23:24Z

2021-08-26T12:12:01Z

@@ Line 40: / Line 40: @@
 	if not pageContainsLink then
 	    insert(parts, "[[" .. city)
-	if areadab then
+			insert(parts, " (" .. areadab .. ")")
-	if countydab then
+			insert(parts, ", " .. countydab .. " County")
 		insert(parts, "|" .. city .. "]]")
 	end
 end

2021-08-26T12:08:47Z

optimizing

← Previous revision		Revision as of 12:08, 26 August 2021
Line 62:		Line 62:
	areadab = args["areadab" .. num]		areadab = args["areadab" .. num]
	countydab = args["countydab" .. num]		countydab = args["countydab" .. num]
		⚫
		⚫	if not(city or location) then
		⚫	return ''
		⚫	end

	if pageContainsLink == false then		if pageContainsLink == false then
Line 70:		Line 74:

	local firstPosition = strfind(page, linkString)		local firstPosition = strfind(page, linkString)
		⚫
	if firstPosition then		if firstPosition then
	local secondPosition = strfind(page, linkString, firstPosition)		local secondPosition = strfind(page, linkString, firstPosition)
	end
⚫
	if firstPosition then
	if secondPosition or string.find(page, jctString) then		if secondPosition or string.find(page, jctString) then
	pageContainsLink = true		pageContainsLink = true
	~~else return~~ end		end
	~~else return~~ end		end
⚫	end
⚫
⚫	if not(city or location) then
⚫	return ''
	end		end

2021-08-25T20:00:34Z

← Previous revision		Revision as of 20:00, 25 August 2021
Line 75:		Line 75:

	if firstPosition then		if firstPosition then
	if secondPosition or ~~strfind~~(page, ~~linkString~~) then		if secondPosition or string.find(page, jctString) then
	pageContainsLink = true		pageContainsLink = true
	else return end		else return end

2021-08-25T18:30:11Z

← Previous revision		Revision as of 18:30, 25 August 2021
Line 69:		Line 69:
	local linkString = generateText(num)		local linkString = generateText(num)

	local firstPosition = strfind(~~linkString~~, ~~page~~)		local firstPosition = strfind(page, linkString)
	if firstPosition then		if firstPosition then
	local secondPosition = strfind(~~linkString~~, ~~page~~, firstPosition)		local secondPosition = strfind(page, linkString, firstPosition)
	end		end

	if firstPosition then		if firstPosition then
	if secondPosition or strfind(~~jctString~~, ~~page~~) then		if secondPosition or strfind(page, linkString) then
	pageContainsLink = true		pageContainsLink = true
	else return end		else return end

2021-08-25T16:23:35Z

← Previous revision		Revision as of 16:23, 25 August 2021
Line 66:		Line 66:
	local place = city or location		local place = city or location

	local jctString = "{{jct\|" .. ".+" .. place .. ".+" .. "}}"		local jctString = "{{jct/sandbox\|" .. ".+" .. place .. ".+" .. "}}"
	local linkString = generateText(num)		local linkString = generateText(num)

2021-08-25T16:21:21Z

← Previous revision		Revision as of 16:21, 25 August 2021
Line 57:		Line 57:
	end		end

	local function ~~location~~(args, num, page)		local function _location(args, num, page)
	city = args["city" .. num]		city = args["city" .. num]
	location = args["location" .. num]		location = args["location" .. num]
Line 93:		Line 93:
	local locationCount = 1		local locationCount = 1
	repeat		repeat
	local location = ~~location~~(args, locationCount, page)		local location = _location(args, locationCount, page)
	insert(cities, location)		insert(cities, location)
	local empty = (location == '')		local empty = (location == '')

2021-08-25T16:17:16Z

@@ Line 23: / Line 23: @@
 		return data[abbr]
 	end
 end
@@ Line 86: / Line 55: @@
 	return concat(parts)
 end

2021-08-25T16:10:50Z

← Previous revision		Revision as of 16:10, 25 August 2021
Line 4:		Line 4:
	local insert = table.insert		local insert = table.insert


			local city
			local location
			local areadab
			local countydab
	local state		local state
	local pageContainsLink		local pageContainsLink
Line 27:		Line 32:

	if pageContainsLink == false then		if pageContainsLink == false then
	place = city or location		local place = city or location

	local jctString = "{{jct\|" .. ".+" .. place .. ".+" .. "}}"		local jctString = "{{jct\|" .. ".+" .. place .. ".+" .. "}}"