Module:EFloras - Revision history

WOSlinker: use require('strict') instead of require('Module:No globals')

2022-10-21T21:57:39Z

use require('strict') instead of require('Module:No globals')

2019-01-24T21:24:24Z

Protected "Module:EFloras": High-risk module ([Edit=Require autoconfirmed or confirmed access] (indefinite))

← Previous revision	Revision as of 21:24, 24 January 2019
(No difference)

2018-08-21T05:05:42Z

make abbreviations case-insensitive (mainly to allow for input like "Populus Sect. Tacamahaca", as it appears in the title of the webpage)

@@ Line 153: / Line 153: @@
 	local rank
 	if name == "" or name == nil then
 		return
@@ Line 167: / Line 168: @@
 			rank = "subtribe"
 		end
-	elseif string.find(name, "subsp.", 1, true) then
+	elseif string.find(lowerName, "subsp.", 1, true) then
 		rank = "subspecies"
-	elseif string.find(name, "subg.", 1, true) then
+	elseif string.find(lowerName, "subg.", 1, true) then
 		rank = "subgenus"
-	elseif string.find(name, "var.", 1, true) then
+	elseif string.find(lowerName, "var.", 1, true) then
 		rank = "variety"
-	elseif string.find(name, "sect.", 1, true) then
+	elseif string.find(lowerName, "sect.", 1, true) then
 		rank = "section"
 	elseif string.find(name, "^%a+%s[%a-]+$") or string.find(name, "^%a+%s×%s[%a-]+$") then
@@ Line 192: / Line 193: @@
 		name = "<i>" .. name .. "</i>"
 		local hybrid = "×"
-		name = name:gsub("%s+" .. hybrid .. "%s+", "</i> " .. hybrid .. " <i>")
+		if name:find(".", 1, true) then
-					unrecognized,
+			local unrecognized
 		end
 	end -- Else do not modify name.

2018-08-19T21:05:32Z

← Previous revision		Revision as of 21:05, 19 August 2018
Line 7:		Line 7:
	local function getResource(floraID)		local function getResource(floraID)
	data = data or mw.loadData("Module:eFloras/data")		data = data or mw.loadData("Module:eFloras/data")
	return data.resources[floraID]		return data.resources[floraID] or data.resources[tonumber(floraID)]
	end		end

2018-08-19T21:03:25Z

data module should use numbers rather than string numbers

← Previous revision		Revision as of 21:03, 19 August 2018
Line 120:		Line 120:
	local family = frame.args[2] or frame.args.family		local family = frame.args[2] or frame.args.family
	data = data or mw.loadData("Module:eFloras/data")		data = data or mw.loadData("Module:eFloras/data")
	local familyToVolume = data.volumeTable[floraID]		local familyToVolume = data.volumeTable[floraID] or data.volumeTable[tonumber(floraID)]
	if familyToVolume == nil then		if familyToVolume == nil then
	return ""		return ""

2018-08-19T21:02:43Z

volumeName function

@@ Line 22: / Line 22: @@
 		end
 	end
 end

2018-08-19T20:53:28Z

neater yet

← Previous revision		Revision as of 20:53, 19 August 2018
Line 112:		Line 112:
	return		return
	elseif string.find(name, "^%u%l+ae$") then		elseif string.find(name, "^%u%l+ae$") then
	if string.find(name, "~~aceae~~$") then		if string.find(name, "eae$") then
		⚫	if string.find(name, "aceae$") then
⚫	rank = "~~family~~"
	elseif string.find(name, "oideae$") then		rank = "family"
			elseif string.find(name, "oideae$") then
	rank = "subfamily"		rank = "subfamily"
			else
⚫	elseif string.find(name, "~~%u%l+~~inae$") then
		⚫	rank = "tribe"
			end
		⚫	elseif string.find(name, "inae$") then
	rank = "subtribe"		rank = "subtribe"
⚫	~~elseif~~ string.find(name, "~~%u%l+eae~~$") then
	rank = "tribe"
	end		end
	elseif string.find(name, "subsp.", ~~nil~~, true) then		elseif string.find(name, "subsp.", 1, true) then
	rank = "subspecies"		rank = "subspecies"
	elseif string.find(name, "subg.", ~~nil~~, true) then		elseif string.find(name, "subg.", 1, true) then
	rank = "subgenus"		rank = "subgenus"
	elseif string.find(name, "var.", ~~nil~~, true) then		elseif string.find(name, "var.", 1, true) then
	rank = "variety"		rank = "variety"
	elseif string.find(name, "sect.", ~~nil~~, true) then		elseif string.find(name, "sect.", 1, true) then
	rank = "section"		rank = "section"
	elseif string.find(name, "^%a+%s[%a-]+$") or string.find(name, "^%a+%s×%s[%a-]+$") then		elseif string.find(name, "^%a+%s[%a-]+$") or string.find(name, "^%a+%s×%s[%a-]+$") then

2018-08-19T20:50:24Z

slight refactoring of rank identification

← Previous revision		Revision as of 20:50, 19 August 2018
Line 111:		Line 111:
	if name == "" or name == nil then		if name == "" or name == nil then
	return		return
	elseif string.find(name, "%u%l+~~eae~~$") then		elseif string.find(name, "^%u%l+ae$") then
	if string.find(name, "aceae$") then		if string.find(name, "aceae$") then
	rank = "family"		rank = "family"
	elseif string.find(name, "oideae$") then		elseif string.find(name, "oideae$") then
	rank = "subfamily"		rank = "subfamily"
		⚫	elseif string.find(name, "%u%l+inae$") then
	else
		⚫	rank = "subtribe"
			elseif string.find(name, "%u%l+eae$") then
	rank = "tribe"		rank = "tribe"
	end		end
⚫	elseif string.find(name, "%u%l+inae$") then
⚫	rank = "subtribe"
	elseif string.find(name, "subsp.", nil, true) then		elseif string.find(name, "subsp.", nil, true) then
	rank = "subspecies"		rank = "subspecies"
Line 134:		Line 134:
	and not string.find(name, ".%u") then -- Uppercase letters can only appear at beginning of taxonomic name.		and not string.find(name, ".%u") then -- Uppercase letters can only appear at beginning of taxonomic name.
	rank = "genus"		rank = "genus"
	else
⚫	mw.log("Module:eFloras could not determine a taxonomic rank for the input that it received: " .. name)
	end		end

	if not rank then		if not rank then
		⚫	mw.log("Module:eFloras could not determine a taxonomic rank for the input that it received: " .. name)
	return orig		return orig
	end		end

2018-08-18T00:28:55Z

fix trimming in italicization function

2018-08-14T02:49:30Z

allow hyphen in species name (not sure about genus name

← Previous revision		Revision as of 02:49, 14 August 2018
Line 129:		Line 129:
	elseif string.find(name, "sect.", nil, true) then		elseif string.find(name, "sect.", nil, true) then
	rank = "section"		rank = "section"
	elseif string.find(name, "^%a+%s%a+$") or string.find(name, "^%a+%s×%s%a+$") then		elseif string.find(name, "^%a+%s[%a-]+$") or string.find(name, "^%a+%s×%s[%a-]+$") then
	rank = "species"		rank = "species"
	elseif string.find(name, "^%u%a+$") -- No one-letter genera, probably.		elseif string.find(name, "^%u%a+$") -- No one-letter genera, probably.