Project

General

Profile

« Previous | Next » 

Revision 6740

Added by Aaron Marcuse-Kubitza over 11 years ago

bin/map: Removed column names simplification, which was causing columns with the same alphanumeric characters but different punctuation to be simplified to the same name. Name simplification is now performed by the mapping mechanism itself, and can be overridden in the mappings.

View differences:

map
305 305 
        def map_table(col_names, rows, **kw_args):
306 306 
            col_names_ct = len(col_names)
307 307 
            col_idxs = util.list_flip(col_names)
308 
            col_names_simp = map(maps.simplify, col_names)
309 
            col_names_map = dict(zip(col_names_simp, col_names))
308 
            col_names_map = dict(zip(col_names, col_names))
310 309 
            prefixes_simp = map(maps.simplify, prefixes)
311 310
312 311 
            # Resolve prefixes
......
317 316 
                else:
318 317 
                    try:
319 318 
                        cols = get_with_prefix(col_names_map, prefixes_simp,
320 
                            maps.simplify(in_))
319 
                            in_)
321 320 
                    except KeyError: pass
322 321 
                    else:
323 322 
                        cols = [(orig, col_idxs[orig]) for simp, orig in cols]

Also available in: Unified diff