Dokumentation
Siehe auch die englische Modulseite: Module:Recipes/test. Sie enthält möglicherweise umfassendere oder aktuellere Informationen.
Für dieses Modul gibt es noch keine Dokumentations-Unterseite. Erstelle jetzt eine.
-- Note: for "Any xxx" group (e.g. "Any Birds"), they should be added to {{tr}} database.
local l10n_info = {
['de'] = {
-- for {{recipes}}--
['cate_unexcepted_rows_count'] = 'Rezepte-Tabelle mit unerwarteter Gesamtzahl an Zeilen',
['cate_no_row'] = 'Rezepte-Tabelle ohne Zeilen',
['header_result'] = 'Resultat',
['header_ingredients'] = 'Zutaten',
['header_station'] = '[[Herstellungsobjekt]]',
['cate_craftable'] = 'Herstellbare Gegenstände',
['station_by_hand'] = '[[kein Objekt]]',
['station_sep_or'] = "<br/>'''''oder'''''<br/>",
['station_sep_and'] = " '''und''' ",
['ingredients_sep'] = " ''oder'' ",
['snow_biome'] = '[[Tundra]]',
['station_cate'] = {
['Lead Anvil'] = 'Eisen- oder Bleiamboss',
['Iron Anvil'] = 'Eisen- oder Bleiamboss',
['Orichalcum Anvil'] = 'Mithril- oder Oreichalkosamboss',
['Mythril Anvil'] = 'Mithril- oder Oreichalkosamboss',
['Demon Altar'] = 'Dämonen- oder Purpur-Altar',
['Crimson Altar'] = 'Dämonen- oder Purpur-Altar',
['Altar'] = 'Dämonen- oder Purpur-Altar',
['Titanium Forge'] = 'Adamantit- oder Titanschmiede',
['Adamantite Forge'] = 'Adamantit- oder Titanschmiede',
['Cauldron'] = 'Kochtopf oder Kessel',
['Cooking Pot'] = 'Kochtopf oder Kessel',
['Bottle only'] = 'Platzierte Flasche',
['Placed Bottle only'] = 'Platzierte Flasche',
['Bottle'] = 'Platzierte Flasche oder Alchemietisch',
['Placed Bottle'] = 'Platzierte Flasche oder Alchemietisch',
['Alchemy Table'] = 'Platzierte Flasche oder Alchemietisch',
['Water'] = 'Wasser oder Waschbecken',
['Sink'] = 'Wasser oder Waschbecken',
['Crystal Ball and Water'] = 'Kristallkugel und Wasser oder Waschbecken',
['Sky Mill and Snow Biome'] = 'Himmelsmühle und Tundra',
['Sky Mill and Water'] = 'Himmelsmühle und Wasser oder Waschbecken',
['Crystal Ball and Lava'] = 'Kristallkugel und Lava',
['Crystal Ball and Honey'] = 'Kristallkugel und Honig',
},
-- for {{recipes/extract}}--
['default_sep_compact'] = "<br/>'''oder'''<br/>",
['default_sep_ingredients'] = "'''oder'''",
['compact_snow_biome'] = '[[Tundra]]',
},
}
local l10n_auto_translate_eicons_pagename = {
['zh'] = true,
}
------- The following is not related to l10n. --------------
local item_link = require('Module:Item').go
local trim = mw.text.trim
local cargo = mw.ext.cargo
local currentFrame -- global cache for current frame object.
local inputArgs -- global args cache.
local lang -- cache current lang.
local l10n_table
local l10n = function(key)
return l10n_table[key] or l10n_info['en'][key]
end
function getArg(key)
local v = trim(inputArgs[key] or '')
if v=='' then
return nil
else
return v
end
end
local itemLink = function(name, args)
local args = args or {}
args[1] = name
args[2] = currentFrame:expandTemplate{ title = 'tr', args = {name, lang=lang} }
args['eicons'] = l10n_auto_translate_eicons_pagename[lang]
args['small'] = 'y'
args['lang'] = lang or 'en'
args['nolink'] = args['nolink'] and 'y' or nil
return item_link(currentFrame, args)
end
-- credit: http://richard.warburton.it
-- this version is with trim.
local explode = function(div,str)
if (div=='') then return false end
local pos,arr = 0,{}
-- for each divider found
for st,sp in function() return string.find(str,div,pos,true) end do
table.insert(arr, trim(string.sub(str,pos,st-1))) -- Attach chars left of current divider
pos = sp + 1 -- Jump past current divider
end
table.insert(arr, trim(string.sub(str,pos))) -- Attach chars right of last divider
return arr
end
-- retuan a array of itemname, split xxx/yyy to item1=xxx, item2=yyy. If it's something like "Lead/Iron Bar", it will normalize as item1 = Iron Bar, item2 = Lead Bar.
local split = (function()
local metals = {
['Copper/Tin'] = 1,
['Silver/Tungsten'] = 1,
['Gold/Platinum'] = 1,
['Iron/Lead'] = 1,
['Cobalt/Palladium'] = 1,
['Mythril/Orichalcum'] = 1,
['Adamantite/Titanium'] = 1,
['Tin/Copper'] = 2,
['Tungsten/Silver'] = 2,
['Platinum/Gold'] = 2,
['Lead/Iron'] = 2,
['Palladium/Cobalt'] = 2,
['Orichalcum/Mythril'] = 2,
['Titanium/Adamantite'] = 2,
}
return function(name)
local count = select(2, name:gsub("/", "/", 2))
if count == 0 then
-- only 1 item
return { trim(name) }
elseif count == 1 then
-- 2 items
local item1a, item1b, item2a, item2b = name:match("^%s*(%S+)%s*(.-)/%s*(%S+)%s*(.-)$")
local x = metals[item1a..'/'..item2a]
if tostring(item1b) == '' and x then
item1b = item2b
end
if x == 2 then
return {trim(item2a..' '..item2b), trim(item1a..' '..item1b)}
else
return {trim(item1a..' '..item1b), trim(item2a..' '..item2b)}
end
else
-- 3 or more items
return explode('/', name)
end
end
end)()
-- return 1 or 2 value(s), when input is name[note], return item, note.
local itemname = function(str)
local item, note = str:match("^(.-)(%b[])$")
if item then
return item, note
else
return str
end
end
-- normalize ingredient name input, Lead Bar=>¦Lead Bar¦, Iron/Lead Bar => ¦Iron Bar¦Lead Bar¦, Lead/Iron Bar => ¦Iron Bar¦Lead Bar¦ ....
local normalize = function(name)
local result = '¦'
for k, v in ipairs(split(name)) do
result = result .. itemname(v) .. '¦'
end
return result
end
local escape = function(str)
return str:gsub("'", "\\'"):gsub("'", "\\'")
end
local enclose = function(str)
return "'" .. escape(str) .. "'"
end
local getItemGroupName = function(item)
if item == 'Wood' or item == 'Ebonwood' or item == 'Rich Mahogany' or item == 'Pearlwood' or item == 'Shadewood'
or item == 'Spooky Wood' or item == 'Boreal Wood' or item == 'Palm Wood' then
return 'Any Wood'
elseif item == 'Iron Bar' or item == 'Lead Bar' then
return 'Any Iron Bar'
elseif item == 'Sand Block' or item == 'Pearlsand Block' or item == 'Crimsand Block' or item == 'Ebonsand Block' or item == 'Hardened Sand Block' then
return 'Any Sand'
elseif item == 'Red Pressure Plate' or item == 'Green Pressure Plate' or item == 'Gray Pressure Plate' or item == 'Brown Pressure Plate'
or item == 'Blue Pressure Plate' or item == 'Yellow Pressure Plate' or item == 'Lihzahrd Pressure Plate' then
return 'Any Pressure Plate'
elseif item == 'Bird' or item == 'Blue Jay' or item == 'Cardinal' then
return 'Any Bird'
elseif item == 'Black Scorpion' or item == 'Scorpion' then
return 'Any Scorpion'
elseif item == 'Squirrel' or item == 'Red Squirrel' then
return 'Any Squirrel'
elseif item == 'Grubby' or item == 'Sluggy' or item == 'Buggy' then
return 'Any Bug'
elseif item == 'Mallard Duck' or item == 'Duck' then
return 'Any Duck'
elseif item == 'Sulphur Butterfly' or item == 'Julia Butterfly' or item == 'Monarch Butterfly' or item == 'Purple Emperor Butterfly'
or item == 'Red Admiral Butterfly' or item == 'Tree Nymph Butterfly' or item == 'Ulysses Butterfly' or item == 'Zebra Swallowtail Butterfly' then
return 'Any Butterfly'
elseif item == 'Firefly' or item == 'Lightning Bug' then
return 'Any Firefly'
elseif item == 'Snail' or item == 'Glowing Snail' then
return 'Any Snail'
end
end
local normalizeStation = function(station)
if station == 'Altar' then
station = 'Demon Altar'
end
return station
end
local normalizeVersion = function(_version)
local _version = trim(_version):lower()
local version = ''
if _version:find('desktop', 1, true) then
version = version .. ' desktop'
end
if _version:find('console', 1, true) then
version = version .. ' console'
elseif _version:find('konsole', 1, true) then
version = version .. ' console'
end
if _version:find('old-gen', 1, true) then
version = version .. ' old-gen'
end
if _version:find('japan', 1, true) then
version = version .. ' japan'
end
if _version:find('mobile', 1, true) then
version = version .. ' mobile'
elseif _version:find('mobil', 1, true) then
version = version .. ' mobile'
end
if _version:find('3ds', 1, true) then
version = version .. ' 3ds'
end
if version == ' desktop console old-gen mobile 3ds' then
version = ''
elseif version == ' desktop konsole old-gen mobile 3ds' then
version = ''
elseif version == ' desktop console old-gen mobil 3ds' then
version = ''
elseif version == ' desktop konsole old-gen mobil 3ds' then
version = ''
end
return trim(version)
end
local criStr = function(args)
local constraints = {}
-- station = ? and station != ?
local _station = trim(args['station'] or '')
local _stationnot = trim(args['stationnot'] or '')
local str = ''
if _station ~= '' then
for _, v in ipairs(explode('/', _station)) do
if str ~= '' then
str = str .. ' OR '
end
str = str .. "station = " .. enclose(normalizeStation(v))
end
end
if _stationnot ~= '' then
if str ~= '' then
str = '(' .. str .. ')'
end
for _, v in ipairs(explode('/', _stationnot)) do
if str ~= '' then
str = str .. ' AND '
end
str = str .. 'station <> ' .. enclose(normalizeStation(v))
end
end
constraints['station'] = str
-- result = ? and result != ?
local _result = trim(args['result'] or '')
local _resultnot = trim(args['resultnot'] or '')
local str = ''
if _result ~= '' then
for _, v in ipairs(explode('/', _result)) do
if str ~= '' then
str = str .. ' OR '
end
if mw.ustring.sub(v, 1, 5) == 'LIKE ' then
str = str .. "result LIKE " .. enclose(trim(mw.ustring.sub(v, 6)))
else
str = str .. 'result=' .. enclose(v)
end
end
end
if _resultnot ~= '' then
if str ~= '' then
str = '(' .. str .. ')'
end
for _, v in ipairs(explode('/', _resultnot)) do
if str ~= '' then
str = str .. ' AND '
end
if mw.ustring.sub(v, 1, 5) == 'LIKE ' then
str = str .. "result NOT LIKE " .. enclose(trim(mw.ustring.sub(v, 6)))
else
str = str .. 'result <> ' .. enclose(v)
end
end
end
if str ~= '' then
constraints['result'] = str
end
-- ingredient = ?
local _ingredient = trim(args['ingredient'] or '')
if _ingredient ~= '' then
local str = ''
for _, v in ipairs(explode('/', _ingredient)) do
if str ~= '' then
str = str .. ' OR '
end
if mw.ustring.sub(v, 1, 1) == '#' then
str = str .. "ingredients HOLDS LIKE '%¦" .. escape(mw.ustring.sub(v, 2)) .. "¦%'"
elseif mw.ustring.sub(v, 1, 5) == 'LIKE ' then
str = str .. "ingredients HOLDS LIKE '%¦" .. escape(trim(mw.ustring.sub(v, 6))) .. "¦%'"
else
str = str .. "ingredients HOLDS LIKE '%¦" .. escape(v) .. "¦%'"
-- any xxx
local group = getItemGroupName(v)
if group then
str = str .. " OR ingredients HOLDS LIKE '%¦" .. escape(group) .. "¦%'"
end
end
end
constraints['ingredient'] = str
end
--versions
local _version = normalizeVersion(args['version'] or args['versions'] or '')
if _version ~= '' then
constraints['version'] = 'version = '..enclose(_version)
end
local where = ''
if constraints['station'] then
where = constraints['station']
end
if constraints['result'] then
if where ~= '' then
where = where .. ' AND '
end
where = where .. '(' .. constraints['result'] .. ')'
end
if constraints['ingredient'] then
if where ~= '' then
where = where .. ' AND '
end
where = where .. '(' .. constraints['ingredient'] .. ')'
end
if constraints['version'] then
if where ~= '' then
where = where .. ' AND '
end
where = where .. '(' .. constraints['version'] .. ')'
end
return where
end
-- for extract/ingredientsum.
local compactStation = function(station, sep)
sep = sep or ' @ ' -- default sep
if station == 'By Hand' then
return ''
elseif station == 'Furnace' or station == 'Work Bench' or station == 'Sawmill' or station == "Tinkerer's Workshop" or station == 'Dye Vat'
or station == 'Loom' or station == 'Keg' or station == 'Hellforge' or station == 'Bookcase' or station == 'Imbuing Station' or station == 'Lava'
or station == 'Honey' or station == 'Glass Kiln' or station == 'Flesh Cloning Vat' or station == 'Autohammer' or station == 'Crystal Ball'
or station == 'Ice Machine' or station == 'Meat Grinder' or station == 'Living Loom' or station == 'Heavy Work Bench' or station == 'Sky Mill'
or station == 'Solidifier' or station == 'Honey Dispenser' or station == 'Bone Welder' or station == 'Blend-O-Matic' or station == 'Steampunk Boiler'
or station == 'Ancient Manipulator' or station == 'Lihzahrd Furnace' or station == 'Living Wood' then
return sep .. itemLink(station, {mode = 'image'})
elseif station == 'Iron Anvil' then
return sep .. itemLink('Iron Anvil', {mode = 'image'}) .. " / " .. itemLink('Lead Anvil', {mode = 'image'})
elseif station == 'Adamantite Forge' then
return sep .. itemLink('Adamantite Forge', {mode = 'image'}) .. " / " .. itemLink('Titanium Forge', {mode = 'image'})
elseif station == 'Mythril Anvil' then
return sep .. itemLink('Mythril Anvil', {mode = 'image'}) .. " / " .. itemLink('Orichalcum Anvil', {mode = 'image'})
elseif station == 'Demon Altar' then
return sep .. itemLink('Demon Altar', {mode = 'image'}) .. " / " .. itemLink('Crimson Altar', {mode = 'image'})
elseif station == 'Cooking Pot' then
return sep .. itemLink('Cooking Pot', {mode = 'image'}) .. " / " .. itemLink('Cauldron', {mode = 'image'})
elseif station == 'Placed Bottle' then
return sep .. itemLink('Placed Bottle', {mode = 'image'}) .. " / " .. itemLink('Alchemy Table', {mode = 'image'})
elseif station == 'Water' then
return sep .. itemLink('Water', {mode = 'image'}) .. " / " .. itemLink('Sink', {mode = 'image'})
elseif station == 'Table and Chair' then
return sep .. itemLink('Table', {mode = 'image'}) .. " & " .. itemLink('Chair', {mode = 'image'})
elseif station == 'Work Bench and Chair' then
return sep .. itemLink('Work Bench', {mode = 'image'}) .. " & " .. itemLink('Chair', {mode = 'image'})
elseif station == 'Crystal Ball and Lava' then
return sep .. itemLink('Crystal Ball', {mode = 'image'}) .. " & " .. itemLink('Lava', {mode = 'image'})
elseif station == 'Crystal Ball and Honey' then
return sep .. itemLink('Crystal Ball', {mode = 'image'}) .. " & " .. itemLink('Honey', {mode = 'image'})
elseif station == 'Crystal Ball and Water' then
return sep .. itemLink('Crystal Ball', {mode = 'image'}) .. " & ".. '( ' .. itemLink('Water', {mode = 'image'}) .. " / " .. itemLink('Sink', {mode = 'image'}) .. ' )'
elseif station == 'Sky Mill and Water' then
return sep .. itemLink('Sky Mill', {mode = 'image'}) .. " & ".. '( ' .. itemLink('Water', {mode = 'image'}) .. " / " .. itemLink('Sink', {mode = 'image'}) .. ' )'
elseif station == 'Sky Mill and Snow Biome' then
return sep .. itemLink('Sky Mill', {mode = 'image'}) .. " & ".. l10n('compact_snow_biome')
elseif station == 'Placed Bottle only' then
return sep .. itemLink('Placed Bottle', {mode = 'image'})
else
return sep .. station
end
end
local getFlags = function(args)
local needCate = 1
local needLink = true
local _cate = trim(args['cate'] or '')
if _cate == 'force' or _cate == 'all' then
needCate = 2
elseif _cate == 'n' or _cate == 'no' then
needCate = nil
end
local _link = trim(args['link'] or '')
if _link == 'y' or _link == 'yes' or _link == 'force' then
needLink = true
elseif _link == 'n' or _link == 'no' then
needLink = false
end
return needCate, needLink
end
-----------------------------------------------------------------
local p = {}
-- for {{recipes/ingredientsum}}
p.ingredientsum = function(frame)
currentFrame = frame -- global frame cache
local args = frame:getParent().args
inputArgs = args
lang = frame.args['lang'] or 'en'
l10n_table = l10n_info[lang] or l10n_info['en']
local where = trim(args['where'] or '')
if where == '' then
where = criStr(args)
end
-- no constraint no result.
if where == '' then
return '<span style="color:red;font-weight:bold;">Recipes/ingredientsum: No constraint</span>'
end
-- query:
local result = mw.ext.cargo.query('Recipes', 'result, resultid, resultimage, resulttext, amount, version, station, args', {
where = where,
groupBy = "resultid, result, amount, version, ings",
orderBy = "result, amount DESC, version", -- Don't order by station
limit = 20, -- enough.
})
-- output
local mode = getArg('mode')
local sep = getArg('sep') or getArg('seperator')
--default mode = compact
local sep = sep or l10n('default_sep_compact')
local withResult = getArg('withresult')
local withStation = not getArg('nostation')
local withVersion = not getArg('noversion')
local str = 'Lorem ipsum'
local results = {}
local ings_init = { [''] = 0 }
local stations_init = { '' }
local version_init = ''
local outputRows = {
-- [1] = { ['ingredients'] = ings_init, ['stations'] = stations_init, ['version'] = version_init },
} -- output rows
str = str .. '<br/>Cycle through ' .. table.maxn(result) .. ' cargo results.'
for i, resultRow in ipairs(result) do
str = str .. '<br/>: Cargo result row ' .. i .. '/' .. table.maxn(result) .. '.'
-- check if this resultRow requires a new output row
local newRow = false
str = str .. '<br/>:: Cycling through <code>results</code>:'
for j, v in ipairs(results) do
str = str .. '<br/>::: ' .. j .. ' – ' .. v
if v == resultRow['result'] then -- result is already present, add new row for it
newRow = true
end
end
str = str .. '<br/>:: Done.'
table.insert(results, resultRow['result']) -- add current result to the list of results
-- this following bit is not foolproof at all and will fail in certain cases, but it's sufficient for the use cases of {{recipes/ingredientsum}}
-- can't hurt to improve it, though!
if resultRow['version'] then
for _, v in ipairs(outputRows) do
if v['version'] ~= '' then
newRow = true
break
end
end
end
str = str .. '<br/>:: New output row? ' .. tostring(newRow)
-- handle creation of new output row
if newRow then
local oldRowMaxn = table.maxn(outputRows)
-- cycle through current rows and duplicate them
local rowsDupl = {}
for _, v in ipairs(outputRows) do -- fill duplicate table from source table
table.insert(rowsDupl, v)
end
for _, v in ipairs(rowsDupl) do -- insert duplicate table into source table
table.insert(outputRows, v)
end
str = str .. '<br/>:: Duplicated rows from ' .. oldRowMaxn .. ' to ' .. table.maxn(outputRows)
end
str = str .. '<br/>:: Add information from this cargo result row to output row(s).'
if i == 1 then
str = str .. '<br/>:: Creating first row.'
-- first row in output rows
local firstRow = {}
firstRow['ingredients'] = {}
firstRow['stations'] = {}
-- information: ingredients
for _, v in ipairs(explode('^', resultRow['args'])) do
local item, amount = v:match('^(.-)¦(.-)$')
firstRow.ingredients[item] = amount
end
-- information: stations
table.insert(firstRow['stations'], resultRow['station'])
-- information: version
firstRow['version'] = resultRow['version']
table.insert(outputRows, firstRow)
str = str .. '<br/>:: Stored row: <i>'
for k, v in pairs(firstRow.ingredients) do
str = str .. '<br/>' .. v .. ' ' .. k
end
str = str .. '<br/>' .. table.concat(firstRow.stations) .. '<br/>' .. firstRow.version .. '</i>'
else
--str = str .. '<br/>:: Not creating first row.'
-- add information from this resultRow to all/new output rows
for j, row in ipairs(outputRows) do
str = str .. '<br/>:: Output row ' .. j .. '.'
local skip = false
if newRow then
if j <= table.maxn(outputRows)/2 then
skip = true
end
end
str = str .. '<br/>:: Skip? ' .. j .. '<=' .. table.maxn(outputRows)/2 .. ' → ' .. tostring(skip)
if not skip then
-- information: ingredients
str = str .. '<br/>:: Storing ingredients.'
local ings = row['ingredients'] or {}
str = str .. '<br/>::: Existing ingredients in this row (' .. j .. '):<small>'
for k, v in pairs(row.ingredients) do
str = str .. '<br/>' .. v .. ' ' .. k
end
str = str .. '</small>'
for _, v in ipairs(explode('^', resultRow['args'])) do
local item, amount = v:match('^(.-)¦(.-)$')
if ings[item] and ings[item] ~= '' then
ings[item] = ings[item] + amount
else
ings[item] = amount
end
str = str .. '<br/>::: Stored ingredients.'
end
str = str .. '<br/>::: Now existing ingredients in this row (' .. j .. '):<small>'
for k, v in pairs(row.ingredients) do
str = str .. '<br/>' .. v .. ' ' .. k
end
str = str .. '</small>'
-- information: stations
str = str .. '<br/>:: Storing station.'
local stations = row['stations'] or {}
local newStation = true
for _, station in ipairs(stations) do
if station == resultRow['station'] then
newStation = false
end
end
if newStation then
table.insert(stations, resultRow['station'])
str = str .. '<br/>::: Stored station.'
end
-- information: version
str = str .. '<br/>:: Storing version.'
if resultRow['version'] then
row['version'] = resultRow['version']
str = str .. '<br/>::: Stored version.'
end
str = str .. '<br/>:: Stored row: <i>'
for k, v in pairs(row.ingredients) do
str = str .. '<br/>' .. v .. ' ' .. k
end
str = str .. '<br/>' .. table.concat(row.stations) .. '<br/>' .. row.version .. '</i>'
end
str = str .. '<br/>:: End output row ' .. j .. '.'
end
end
str = str .. '<br/>: End cargo result row ' .. i .. '/' .. table.maxn(result) .. '.'
end
str = str .. '<br/>End cargo result cycle.'
str = str .. '<br/>Rows: <i>'
for _, row in ipairs(outputRows) do
for k, v in pairs(row.ingredients) do
str = str .. '<br/>' .. v .. ' ' .. k
end
str = str .. '<br/>' .. table.concat(row.stations) .. '<br/>' .. row.version
end
str = str .. '</i>'
str = str .. '<br/>Start output:<br/><div class=terraria>'
-- concat print string
for _, row in ipairs(outputRows) do
if str then
str = str .. sep
else
str = ''
end
str = str .. '<span class="recipe compact">'
-- version
if withVersion then
if row['version'] ~= '' then
str = str ..currentFrame:expandTemplate{ title = 'version icons', args = {row['version']} }..': '
end
end
-- ingredients
local ingFlag = nil
for item, amount in pairs(row['ingredients']) do
if ingFlag then
str = str .. ' + '
else
ingFlag = true
end
if amount ~= '1' then
str = str .. amount .. ' '
end
local s
for _, itemname in ipairs(split(item)) do
if s then
s = s .. " / " .. itemLink(itemname, {mode='image'})
else
s = itemLink(itemname, {mode='image'})
end
end
str = str .. s
end
-- station
local stationFlag = nil
if withStation then
for _, station in ipairs(row['stations']) do
if stationFlag then
str = str .. ' + ' .. compactStation(station, '')
else
stationFlag = true
str = str .. compactStation(station)
end
end
end
str = str..'</span>'
end
str = str .. '</div>End output.<br/><br/>'
return str
end -- p.ingredientsum
return p