Module:Geological time - Revision history

Jlwoodwa: dedup Calabrian

2024-09-28T22:54:52Z

dedup Calabrian

← Previous revision		Revision as of 22:54, 28 September 2024
Line 58:		Line 58:
	'Danian','Selandian','Thanetian','Ypresian','Lutetian','Bartonian','Priabonian','Rupelian','Chattian',		'Danian','Selandian','Thanetian','Ypresian','Lutetian','Bartonian','Priabonian','Rupelian','Chattian',
	{base='Aquitanian', dab='(stage)'},'Burdigalian','Langhian','Serravallian','Tortonian','Messinian','Zanclean','Piacenzian',		{base='Aquitanian', dab='(stage)'},'Burdigalian','Langhian','Serravallian','Tortonian','Messinian','Zanclean','Piacenzian',
	'Gelasian',{base='Calabrian', dab='(stage)'}~~,'Calabrian'~~,'Late Pleistocene','Greenlandian','Northgrippian','Meghalayan'}		'Gelasian',{base='Calabrian', dab='(stage)'},'Late Pleistocene','Greenlandian','Northgrippian','Meghalayan'}

	-- Determine whether a query string matches a stored timespan string		-- Determine whether a query string matches a stored timespan string

Hike395: add function to find timespans before and after

2024-06-11T01:52:39Z

add function to find timespans before and after

@@ Line 164: / Line 164: @@
 end
 function p.seeAlso(frame)
 	local args = getArgs(frame)
 	return p._seeAlso(args)
 end

Hike395: more spaces for readability

2022-12-07T06:49:08Z

Partofthemachine: Added newlines to make the code easier to read

2022-12-07T01:17:24Z

Added newlines to make the code easier to read

← Previous revision		Revision as of 01:17, 7 December 2022
Line 9:		Line 9:
	-- adjacent to those matches		-- adjacent to those matches
	p.eon = {'Hadean', 'Archean', 'Proterozoic', 'Phanerozoic'}		p.eon = {'Hadean', 'Archean', 'Proterozoic', 'Phanerozoic'}

	p.era = {'Eoarchean', 'Paleoarchean', 'Mesoarchean', 'Neoarchean',		p.era = {'Eoarchean', 'Paleoarchean', 'Mesoarchean', 'Neoarchean',
	'Paleoproterozoic', 'Mesoproterozoic', 'Neoproterozoic',		'Paleoproterozoic', 'Mesoproterozoic', 'Neoproterozoic',
	'Paleozoic', 'Mesozoic', 'Cenozoic'}		'Paleozoic', 'Mesozoic', 'Cenozoic'}

	p.period = {'Siderian', 'Rhyacian', 'Orosirian', 'Statherian',		p.period = {'Siderian', 'Rhyacian', 'Orosirian', 'Statherian',
	'Calymmian', 'Ectasian', 'Stenian',		'Calymmian', 'Ectasian', 'Stenian',
Line 17:		Line 19:
	'Cambrian', 'Ordovician', 'Silurian', 'Devonian', 'Carboniferous', 'Permian',		'Cambrian', 'Ordovician', 'Silurian', 'Devonian', 'Carboniferous', 'Permian',
	'Triassic', 'Jurassic', 'Cretaceous', 'Paleogene', 'Neogene', 'Quaternary'}		'Triassic', 'Jurassic', 'Cretaceous', 'Paleogene', 'Neogene', 'Quaternary'}

	p.epoch = {'Terreneuvian', 'Cambrian Series 2', 'Miaolingian', 'Furongian',		p.epoch = {'Terreneuvian', 'Cambrian Series 2', 'Miaolingian', 'Furongian',
	'Early Ordovician', 'Middle Ordovician', 'Late Ordovician',		'Early Ordovician', 'Middle Ordovician', 'Late Ordovician',

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

2022-10-21T22:02:30Z

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

← Previous revision		Revision as of 22:02, 21 October 2022
Line 1:		Line 1:
	require('~~Module:No globals~~')		require('strict')
	local getArgs = require('Module:Arguments').getArgs		local getArgs = require('Module:Arguments').getArgs
	local catPair = require('Module:Category pair')._pair		local catPair = require('Module:Category pair')._pair

Hike395: trim unneeded check

2022-04-29T22:04:25Z

trim unneeded check

← Previous revision		Revision as of 22:04, 29 April 2022
Line 153:		Line 153:
	return warn		return warn
	end		end
	local prevTitle = ~~adjacent and~~ adjacent.prev and mw.title.new(adjacent.prev, namespace)		local prevTitle = adjacent.prev and mw.title.new(adjacent.prev, namespace)
	local nextTitle = ~~adjacent and~~ adjacent.next and mw.title.new(adjacent.next, namespace)		local nextTitle = adjacent.next and mw.title.new(adjacent.next, namespace)
	return catPair(prevTitle, nextTitle)		return catPair(prevTitle, nextTitle)
	end		end

Hike395: always preview warn

2022-04-26T05:55:26Z

always preview warn

← Previous revision		Revision as of 05:55, 26 April 2022
Line 145:		Line 145:
	local namespace = title.namespace		local namespace = title.namespace
	local adjacent = find(basetext)		local adjacent = find(basetext)
	if not adjacent ~~and mw.title.getCurrentTitle().nsText ~= "Template"~~ then		if not adjacent then
	local warning = require('Module:If preview')._warning		local warning = require('Module:If preview')._warning
	local warn = warning({"Cannot find geological time frame in "..basetext})		local warn = warning({"Cannot find geological time frame in "..basetext})
			if mw.title.getCurrentTitle().nsText ~= "Template" then
	~~return~~ warn.."[[Category:Missing geological time frame]]"		warn = warn.."[[Category:Missing geological time frame]]"
			end
			return warn
	end		end
	local prevTitle = adjacent and adjacent.prev and mw.title.new(adjacent.prev, namespace)		local prevTitle = adjacent and adjacent.prev and mw.title.new(adjacent.prev, namespace)

Hike395: only load warning function when needed

2022-04-26T05:50:20Z

only load warning function when needed

← Previous revision		Revision as of 05:50, 26 April 2022
Line 2:		Line 2:
	local getArgs = require('Module:Arguments').getArgs		local getArgs = require('Module:Arguments').getArgs
	local catPair = require('Module:Category pair')._pair		local catPair = require('Module:Category pair')._pair
⚫	local warning = require('Module:If preview')._warning

	local p = {}		local p = {}
Line 147:		Line 146:
	local adjacent = find(basetext)		local adjacent = find(basetext)
	if not adjacent and mw.title.getCurrentTitle().nsText ~= "Template" then		if not adjacent and mw.title.getCurrentTitle().nsText ~= "Template" then
		⚫	local warning = require('Module:If preview')._warning
	local warn = warning({"Cannot find geological time frame in "..basetext})		local warn = warning({"Cannot find geological time frame in "..basetext})
	return warn.."[[Category:Missing geological time frame]]"		return warn.."[[Category:Missing geological time frame]]"

Hike395: call catPair instead of Hatnote, use preview warning

2021-12-17T07:19:12Z

call catPair instead of Hatnote, use preview warning

@@ Line 1: / Line 1: @@
 require('Module:No globals')
 local getArgs = require('Module:Arguments').getArgs
-local hatnoteModule = require('Module:Hatnote')
+local catPair = require('Module:Category pair')._pair
 local p = {}
@@ Line 55: / Line 53: @@
 	'Danian','Selandian','Thanetian','Ypresian','Lutetian','Bartonian','Priabonian','Rupelian','Chattian',
 	{base='Aquitanian', dab='(stage)'},'Burdigalian','Langhian','Serravallian','Tortonian','Messinian','Zanclean','Piacenzian',
-	'Gelasian',{base='Calabrian', dab='(stage)'},'Late Pleistocene','Greenlandian','Northgrippian','Meghalayan'}
+	'Gelasian',{base='Calabrian', dab='(stage)'},'Calabrian','Late Pleistocene','Greenlandian','Northgrippian','Meghalayan'}
 -- Determine whether a query string matches a stored timespan string
@@ Line 136: / Line 134: @@
 	end
 	return nil
 end
@@ Line 176: / Line 143: @@
 function p._seeAlso(args)
 	local title = args[1] and mw.title.new(args[1]) or mw.title.getCurrentTitle()
 	local basetext = title.baseText
 	local namespace = title.namespace
 	local adjacent = find(basetext)
-	if not adjacent then
+	if not adjacent and mw.title.getCurrentTitle().nsText ~= "Template" then
-		return mw.title.getCurrentTitle().nsText == "Template" and "" or makeWikitextError("Cannot find geological time frame in "..basetext)
+		local warn = warning({"Cannot find geological time frame in "..basetext})
 	end
-	return p._pair(namespace, adjacent.prev, adjacent.next)
+	local prevTitle = adjacent and adjacent.prev and mw.title.new(adjacent.prev, namespace)
 end

Hike395: rm dup

2021-12-15T04:45:28Z

rm dup

← Previous revision		Revision as of 04:45, 15 December 2021
Line 55:		Line 55:
	'Danian','Selandian','Thanetian','Ypresian','Lutetian','Bartonian','Priabonian','Rupelian','Chattian',		'Danian','Selandian','Thanetian','Ypresian','Lutetian','Bartonian','Priabonian','Rupelian','Chattian',
	{base='Aquitanian', dab='(stage)'},'Burdigalian','Langhian','Serravallian','Tortonian','Messinian','Zanclean','Piacenzian',		{base='Aquitanian', dab='(stage)'},'Burdigalian','Langhian','Serravallian','Tortonian','Messinian','Zanclean','Piacenzian',
	'Gelasian',{base='Calabrian', dab='(stage)'}~~,'Calabrian'~~,'Late Pleistocene','Greenlandian','Northgrippian','Meghalayan'}		'Gelasian',{base='Calabrian', dab='(stage)'},'Late Pleistocene','Greenlandian','Northgrippian','Meghalayan'}

	-- Determine whether a query string matches a stored timespan string		-- Determine whether a query string matches a stored timespan string

← Previous revision		Revision as of 06:49, 7 December 2022
Line 8:		Line 8:
	-- these lists for a match, then return an appropriate link to the timespans		-- these lists for a match, then return an appropriate link to the timespans
	-- adjacent to those matches		-- adjacent to those matches

	p.eon = {'Hadean', 'Archean', 'Proterozoic', 'Phanerozoic'}		p.eon = {'Hadean', 'Archean', 'Proterozoic', 'Phanerozoic'}

Line 32:		Line 33:
	'Paleocene', 'Eocene', 'Oligocene',		'Paleocene', 'Eocene', 'Oligocene',
	'Miocene', 'Pliocene', 'Pleistocene', 'Holocene'}		'Miocene', 'Pliocene', 'Pleistocene', 'Holocene'}

	p.series = {'Furongian',		p.series = {'Furongian',
	'Lower Ordovician', 'Middle Ordovician', 'Upper Ordovician',		'Lower Ordovician', 'Middle Ordovician', 'Upper Ordovician',
Line 41:		Line 43:
	'Lower Jurassic', 'Middle Jurassic', 'Upper Jurassic',		'Lower Jurassic', 'Middle Jurassic', 'Upper Jurassic',
	'Lower Cretaceous', 'Upper Cretaceous','Paleocene'}		'Lower Cretaceous', 'Upper Cretaceous','Paleocene'}

	p.age = {'Fortunian', 'Cambrian Stage 2', 'Cambrian Stage 3', 'Cambrian Stage 4',		p.age = {'Fortunian', 'Cambrian Stage 2', 'Cambrian Stage 3', 'Cambrian Stage 4',
	'Wuliuan', 'Drumian', 'Guzhangian', 'Paibian', 'Jiangshanian', 'Cambrian Stage 10',		'Wuliuan', 'Drumian', 'Guzhangian', 'Paibian', 'Jiangshanian', 'Cambrian Stage 10',