Import soldier lead module
Import soldier lead module
Line 159: Line 159:
end
end
return out
return out
end
local function assignmentLink(raw)
raw = trim(raw)
if raw == '' then
return ''
end
raw = mw.ustring.gsub(raw, '[#<>%[%]|{}]', '')
raw = trim(raw)
if raw == '' then
return ''
end
return string.format('[[Assignment %s|%s]]', raw, raw)
end
end


Line 179: Line 192:
end
end
td:wikitext(value)
td:wikitext(value)
end
local function yearOnly(s)
s = trim(s)
if s == '' or s == '?' then
return ''
end
local year = mw.ustring.match(s, '(%d%d%d%d)')
if year then
return year
end
return ''
end
local RANK_MAP = {
['PVT'] = 'Private',
['PVTE'] = 'Private',
['PRIVATE'] = 'Private',
['PFC'] = 'Private First Class',
['P F C'] = 'Private First Class',
['PRIVATE FIRST CLASS'] = 'Private First Class',
['CPL'] = 'Corporal',
['CORPORAL'] = 'Corporal',
['T/5'] = 'Technician Fifth Grade',
['TEC5'] = 'Technician Fifth Grade',
['TEC 5'] = 'Technician Fifth Grade',
['T5'] = 'Technician Fifth Grade',
['TECH 5'] = 'Technician Fifth Grade',
['SGT'] = 'Sergeant',
['SERGEANT'] = 'Sergeant',
['T/4'] = 'Technician Fourth Grade',
['TEC4'] = 'Technician Fourth Grade',
['TEC 4'] = 'Technician Fourth Grade',
['T4'] = 'Technician Fourth Grade',
['TECH 4'] = 'Technician Fourth Grade',
['S/SGT'] = 'Staff Sergeant',
['SSGT'] = 'Staff Sergeant',
['S SGT'] = 'Staff Sergeant',
['STAFF SERGEANT'] = 'Staff Sergeant',
['T/3'] = 'Technician Third Grade',
['TEC3'] = 'Technician Third Grade',
['TEC 3'] = 'Technician Third Grade',
['T3'] = 'Technician Third Grade',
['TECH 3'] = 'Technician Third Grade',
['T/SGT'] = 'Technical Sergeant',
['TSGT'] = 'Technical Sergeant',
['T SGT'] = 'Technical Sergeant',
['TECHNICAL SERGEANT'] = 'Technical Sergeant',
['1ST SGT'] = 'First Sergeant',
['1SGT'] = 'First Sergeant',
['FIRST SERGEANT'] = 'First Sergeant',
['M/SGT'] = 'Master Sergeant',
['MSGT'] = 'Master Sergeant',
['MASTER SERGEANT'] = 'Master Sergeant',
['WO'] = 'Warrant Officer',
['WOJG'] = 'Warrant Officer',
['WARRANT OFFICER'] = 'Warrant Officer',
['CWO'] = 'Chief Warrant Officer',
['2ND LT'] = 'Second Lieutenant',
['2D LT'] = 'Second Lieutenant',
['2LT'] = 'Second Lieutenant',
['SECOND LIEUTENANT'] = 'Second Lieutenant',
['1ST LT'] = 'First Lieutenant',
['1LT'] = 'First Lieutenant',
['FIRST LIEUTENANT'] = 'First Lieutenant',
['LT'] = 'Lieutenant',
['LIEUTENANT'] = 'Lieutenant',
['CAPT'] = 'Captain',
['CPT'] = 'Captain',
['CAPTAIN'] = 'Captain',
['MAJ'] = 'Major',
['MAJOR'] = 'Major',
['LT COL'] = 'Lieutenant Colonel',
['LTCOL'] = 'Lieutenant Colonel',
['LTC'] = 'Lieutenant Colonel',
['LIEUTENANT COLONEL'] = 'Lieutenant Colonel',
['COL'] = 'Colonel',
['COLONEL'] = 'Colonel',
['BRIG GEN'] = 'Brigadier General',
['BG'] = 'Brigadier General',
['BRIGADIER GENERAL'] = 'Brigadier General',
['MAJ GEN'] = 'Major General',
['MG'] = 'Major General',
['MAJOR GENERAL'] = 'Major General',
['LT GEN'] = 'Lieutenant General',
['LIEUTENANT GENERAL'] = 'Lieutenant General',
['GEN'] = 'General',
['GENERAL'] = 'General',
['TECH'] = 'Technician',
['TEC'] = 'Technician',
}
local function expandRank(raw)
raw = trim(raw)
if raw == '' then
return ''
end
local key = mw.ustring.upper(raw)
key = mw.ustring.gsub(key, '%.', '')
key = mw.ustring.gsub(key, '%s+', ' ')
key = trim(key)
return RANK_MAP[key] or raw
end
local function lifespan(birth, death)
birth = yearOnly(birth)
death = yearOnly(death)
if birth ~= '' and death ~= '' then
return ' (' .. birth .. '&ndash;' .. death .. ')'
end
if birth ~= '' then
return ' (born ' .. birth .. ')'
end
if death ~= '' then
return ' (died ' .. death .. ')'
end
return ''
end
local function preferredRank(frame)
local rank = expandRank(parentArg(frame, 'rank_final'))
if rank == '' then
rank = expandRank(parentArg(frame, 'class_rank'))
end
return rank
end
end


Line 220: Line 358:


local alias = parentArg(frame, 'alias')
local alias = parentArg(frame, 'alias')
local birth = parentArg(frame, 'birth_year')
local birth = yearOnly(parentArg(frame, 'birth_year'))
local death = parentArg(frame, 'death_year')
local death = yearOnly(parentArg(frame, 'death_year'))
local nativity = parentArg(frame, 'nativity')
local nativity = parentArg(frame, 'nativity')
local religion = parentArg(frame, 'religion')
local religion = parentArg(frame, 'religion')
Line 256: Line 394:
addRow(tbl, 'ASN', parentArg(frame, 'asn'), 'serial')
addRow(tbl, 'ASN', parentArg(frame, 'asn'), 'serial')


local rankFinal = parentArg(frame, 'rank_final')
local rankFinal = expandRank(parentArg(frame, 'rank_final'))
local classRank = parentArg(frame, 'class_rank')
local classRank = expandRank(parentArg(frame, 'class_rank'))
if rankFinal ~= '' and classRank ~= '' and classRank ~= rankFinal then
if rankFinal ~= '' and classRank ~= '' and classRank ~= rankFinal then
addRow(tbl, 'Rank', rankFinal)
addRow(tbl, 'Rank', rankFinal)
Line 281: Line 419:
addRow(tbl, 'Enlisted', titleCase(enlist))
addRow(tbl, 'Enlisted', titleCase(enlist))
end
end
addRow(tbl, 'Assignment', parentArg(frame, 'assignment'))
addRow(tbl, 'Assignment', assignmentLink(parentArg(frame, 'assignment')))
addRow(tbl, 'Unit / division', parentArg(frame, 'division'))
addRow(tbl, 'Unit / division', parentArg(frame, 'division'))
addRow(tbl, 'IPW (German)', parentArg(frame, 'ipw_ge'))
addRow(tbl, 'IPW (German)', parentArg(frame, 'ipw_ge'))
addRow(tbl, 'IPW (Italian)', parentArg(frame, 'ipw_it'))
addRow(tbl, 'IPW (Italian)', parentArg(frame, 'ipw_it'))
addRow(tbl, 'Overseas', parentArg(frame, 'overseas'))
addRow(tbl, 'Special', parentArg(frame, 'special'))
addRow(tbl, 'Special', parentArg(frame, 'special'))
addRow(tbl, 'LOC', parentArg(frame, 'loc'))
addRow(tbl, 'LOC', parentArg(frame, 'loc'))
Line 297: Line 434:
function p.lead(frame)
function p.lead(frame)
local name = displayName(frame)
local name = displayName(frame)
local surname = parentArg(frame, 'surname')
local rank = preferredRank(frame)
if surname == '' then
local role = 'United States Army soldier'
surname = name
if rank ~= '' then
end
role = 'United States Army ' .. rank
local birth = parentArg(frame, 'birth_year')
local death = parentArg(frame, 'death_year')
local dates = ''
if birth ~= '' and death ~= '' then
dates = string.format(' (%s – %s)', birth, death)
elseif birth ~= '' then
dates = string.format(' (born %s)', birth)
elseif death ~= '' then
dates = string.format(' (died %s)', death)
end
end


Line 316: Line 444:
if #classLinks == 1 then
if #classLinks == 1 then
trained = ' who trained at [[Camp Ritchie]], Maryland, in ' .. classLinks[1]
trained = ' who trained at [[Camp Ritchie]], Maryland, in ' .. classLinks[1]
elseif #classLinks > 1 then
elseif #classLinks == 2 then
trained = ' who trained at [[Camp Ritchie]], Maryland, in classes ' .. table.concat(classLinks, ', ')
trained = ' who trained at [[Camp Ritchie]], Maryland, in ' .. classLinks[1] .. ' and ' .. classLinks[2]
elseif #classLinks > 2 then
trained = ' who trained at [[Camp Ritchie]], Maryland, in '
.. table.concat(classLinks, ', ', 1, #classLinks - 1)
.. ', and ' .. classLinks[#classLinks]
else
else
trained = ' associated with Camp Ritchie, Maryland'
trained = ' associated with Camp Ritchie, Maryland'
end
end


local first = string.format(
return string.format(
"'''%s'''%s was a United States Army soldier%s.",
"'''%s'''%s was a %s%s.",
name,
name,
dates,
lifespan(parentArg(frame, 'birth_year'), parentArg(frame, 'death_year')),
role,
trained
trained
)
)
local more = {}
local enlist = parentArg(frame, 'enlistment_place')
local state = parentArg(frame, 'state')
if enlist ~= '' then
local place = titleCase(enlist)
if state ~= '' then
local stateTitle = titleCase(state)
if not containsIgnoreCase(place, stateTitle) then
place = place .. ', ' .. stateTitle
end
end
table.insert(more, surname .. ' enlisted at ' .. place .. '.')
elseif state ~= '' then
table.insert(more, 'Records list ' .. titleCase(state) .. ' as the state of enlistment or residence.')
end
local rank = parentArg(frame, 'rank_final')
if rank == '' then
rank = parentArg(frame, 'class_rank')
end
if rank ~= '' then
table.insert(more, 'Records list the rank as ' .. rank .. '.')
end
local assignment = parentArg(frame, 'assignment')
if assignment ~= '' then
table.insert(more, surname .. ' was assigned to ' .. assignment .. '.')
end
local ipw = {}
local ge = parentArg(frame, 'ipw_ge')
local it = parentArg(frame, 'ipw_it')
if ge ~= '' then
table.insert(ipw, 'German-language IPW team ' .. ge)
end
if it ~= '' then
table.insert(ipw, 'Italian-language IPW team ' .. it)
end
if #ipw > 0 then
table.insert(more, 'Interrogation duty included ' .. table.concat(ipw, ' and ') .. '.')
end
if #more == 0 then
return first
end
return first .. '\n\n' .. table.concat(more, ' ')
end
end


return p
return p