library-mirrors/lua-csv
1
0
Fork 0
mirror of https://github.com/geoffleyland/lua-csv.git synced 2024-11-23 01:34:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

be consistent about removing spaces from the end of strings

Browse Source
This commit is contained in:
Geoff Leyland 2014-09-30 09:54:46 +13:00
parent 6d254a27a4
commit 4a7fec836d
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lua/csv.lua
View File

@ -35,6 +35,12 @@ end
local column_map = {} local column_map = {}
column_map.__index = column_map column_map.__index = column_map
local function normalise_string(s)
return (s:lower():gsub("[^%w%d]+", " "):gsub("^ *(.-) *$", "%1"))
end
--- Parse a list of columns. --- Parse a list of columns.
-- The main job here is normalising column names and dealing with columns -- The main job here is normalising column names and dealing with columns
-- for which we have more than one possible name in the header. -- for which we have more than one possible name in the header.
@ -46,10 +52,10 @@ function column_map:new(columns)
if type(v) == "table" then if type(v) == "table" then
t = { transform = v.transform, default = v.default } t = { transform = v.transform, default = v.default }
if v.name then if v.name then
names = { (v.name:gsub("[^%w%d]+", " ")) } names = { normalise_string(v.name) }
elseif v.names then elseif v.names then
names = v.names names = v.names
for i, n in ipairs(names) do names[i] = n:gsub("[^%w%d]+", " ") end for i, n in ipairs(names) do names[i] = normalise_string(n) end
end end
else else
if type(v) == "function" then if type(v) == "function" then
@ -84,7 +90,7 @@ function column_map:read_header(header)
local found = {} local found = {}
local found_any local found_any
for i, word in ipairs(header) do for i, word in ipairs(header) do
word = word:lower():gsub("[^%w%d]+", " "):gsub("^ *(.-) *$", "%1") word = normalise_string(word)
local r = self.name_map[word] local r = self.name_map[word]
if r then if r then
index_map[i] = r index_map[i] = r