Module:Jct/city and Module:Jct/city/sandbox: Difference between pages

Content deleted Content added

@@ Line 4: / Line 4: @@
 local insert = table.insert
+local city
+local location
+local areadab
+local countydab
 local state
+local pageContainsLink
 local function stateName(args)
@@ Line 19: / Line 25: @@
 end
-local function location(args, num)
+local function generateText(num, insertPrefix)
-	local city = args["city" .. num]
-	local location = args["location" .. num]
-	local areadab = args["areadab" .. num]
-	local countydab = args["countydab" .. num]
-	if not(city or location) then
-		return ''
-	end
 	local parts
-	if num == 1 then
+	if insertPrefix then
-		parts = {"– "}
+		if num == 1 then
+			parts = {"– "}
-	else
-		parts = {", "}
+		else
+			parts = {", "}
+		end
 	end
@@ Line 41: / Line 40: @@
 	end
+	if not pageContainsLink then
-	insert(parts, "[[" .. city)
+	    insert(parts, "[[" .. city)
-	if areadab then
-		insert(parts, " (" .. areadab .. ")")
+		if areadab then
+			insert(parts, " (" .. areadab .. ")")
+		end
+		if countydab then
+			insert(parts, ", " .. countydab .. " County")
+		end
+		if state then
+			insert(parts, ", " .. state)
+		end
+		insert(parts, "|" .. city .. "]]")
+		return concat(parts)
+	else
+		insert(parts, city)
+		return concat(parts)
 	end
+end
-	if countydab then
-		insert(parts, ", " .. countydab .. " County")
+local function _location(args, num, page)
+	city = args["city" .. num]
+	location = args["location" .. num]
+	areadab = args["areadab" .. num]
+	countydab = args["countydab" .. num]
+	if not(city or location) then
+		return ''
 	end
-	if state then
+	if pageContainsLink == false then
-		insert(parts, ", " .. state)
+		local place = city or location
+		local jctString = "{{jct/sandbox|" .. ".+" .. place .. ".+" .. "}}"
+		local linkString = generateText(num, false)
+		local firstPosition = strfind(page, linkString)
+		if firstPosition then
+			local secondPosition = strfind(page, linkString, firstPosition)
+			if secondPosition or string.find(page, jctString) then
+				pageContainsLink = true
+			end
+		end
 	end
+	return generateText(num, true)
-	insert(parts, "|" .. city .. "]]")
-	return concat(parts)
 end
-function p.city(args)
+function p.city(args, page)
 	state = stateName(args)
 	local cities = {}
 	local locationCount = 1
 	repeat
-		local location = location(args, locationCount)
+		local location = _location(args, locationCount, page)
 		insert(cities, location)
 		local empty = (location == '')