2008-01-18 Douglas S. Blank <dblank@cs.brynmawr.edu>

* src/plugins/ImportCSV.py (cleanup_column_name): 
	use given, givenname as aliases for firstname;
	give better warning for missing data on row



svn: r9893
This commit is contained in:
Doug Blank 2008-01-19 03:29:29 +00:00
parent 07e11bc658
commit b3d5ad9855
2 changed files with 8 additions and 1 deletions

View File

@ -1,3 +1,8 @@
2008-01-18 Douglas S. Blank <dblank@cs.brynmawr.edu>
* src/plugins/ImportCSV.py (cleanup_column_name):
use given, givenname as aliases for firstname;
give better warning for missing data on row
2008-01-18 Erik De Richter <frederik.de.richter@pandora.be> 2008-01-18 Erik De Richter <frederik.de.richter@pandora.be>
* /po/nl.po: new translations * /po/nl.po: new translations

View File

@ -141,7 +141,7 @@ def rd(line_number, row, col, key, default = None):
""" Return Row data by column name """ """ Return Row data by column name """
if key in col: if key in col:
if col[key] >= len(row): if col[key] >= len(row):
print "Error: invalid column reference on line", line_number print "Warning: missing '%s' on line %d" % (key, line_number)
return default return default
retval = row[col[key]].strip() retval = row[col[key]].strip()
if retval == "": if retval == "":
@ -164,6 +164,8 @@ def cleanup_column_name(column):
retval = "husband" retval = "husband"
elif retval == "parent2": elif retval == "parent2":
retval = "wife" retval = "wife"
elif retval in ["given", "givenname"]:
retval = "firstname"
return retval return retval
def importData(db, filename, callback=None): def importData(db, filename, callback=None):