Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

4614: Views with persons name look strang after XML import

Browse Source 
svn: r16652
This commit is contained in:
Michiel Nauta 2011-02-17 18:09:53 +00:00
parent e25b523fc5
commit 17e1091024
1 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/gen/display/name.py
View File

@ -222,9 +222,6 @@ class NameDisplay(object):
def __init__(self): def __init__(self):
global WITH_GRAMP_CONFIG global WITH_GRAMP_CONFIG
self.name_formats = {} self.name_formats = {}
#preinit the name formats, this should be updated with the data
#in the database once a database is loaded
self.set_name_format(self.STANDARD_FORMATS)
if WITH_GRAMPS_CONFIG: if WITH_GRAMPS_CONFIG:
self.default_format = config.get('preferences.name-format') self.default_format = config.get('preferences.name-format')
@ -234,11 +231,9 @@ class NameDisplay(object):
else: else:
self.default_format = Name.LNFN self.default_format = Name.LNFN
#following has little sense as the database name formats are not #preinit the name formats, this should be updated with the data
#loaded yet, but we do it to set up everything #in the database once a database is loaded
#when loading a database, name formats must be loaded and self.set_name_format(self.STANDARD_FORMATS)
#default format set again!
self.set_default_format(self.default_format)
def _format_fn(self, fmt_str): def _format_fn(self, fmt_str):
return lambda x: self.format_str(x, fmt_str) return lambda x: self.format_str(x, fmt_str)
@ -272,13 +267,12 @@ class NameDisplay(object):
#remove data from previous database #remove data from previous database
self.name_formats = {} self.name_formats = {}
for tformats in [self.STANDARD_FORMATS, formats]: for tformats in self.STANDARD_FORMATS + formats:
for (num, name, fmt_str, act) in tformats: (num, name, fmt_str, act) = tformats
func = self._format_fn(fmt_str) func = self._format_fn(fmt_str)
func_raw = raw_func_dict.get(num) func_raw = raw_func_dict.get(num, self._format_raw_fn(fmt_str))
if func_raw is None: self.name_formats[num] = (name, fmt_str, act, func, func_raw)
func_raw = self._format_raw_fn(fmt_str) self.set_default_format(self.get_default_format())
self.name_formats[num] = (name, fmt_str, act, func, func_raw)
def add_name_format(self, name, fmt_str): def add_name_format(self, name, fmt_str):
num = -1 num = -1