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

sort_as and display_as of a name was ignored on import if only one is specified.

Browse Source 
svn: r16516
This commit is contained in:
Michiel Nauta 2011-01-31 18:59:46 +00:00
parent 2d3ecfb22f
commit 3e97bb9003
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/import/ImportXml.py
View File

@ -1315,14 +1315,18 @@ class GrampsParser(UpdateCallback):
self.alt_name = bool(attrs.get("alt", 0)) self.alt_name = bool(attrs.get("alt", 0))
try: try:
sort_as = int(attrs["sort"]) sort_as = int(attrs["sort"])
display_as = int(attrs["display"])
# check if these pointers need to be remapped # check if these pointers need to be remapped
# and set the name attributes # and set the name attributes
if sort_as in self.name_formats_map: if sort_as in self.name_formats_map:
self.name.sort_as = self.name_formats_map[sort_as] self.name.sort_as = self.name_formats_map[sort_as]
else: else:
self.name.sort_as = sort_as self.name.sort_as = sort_as
except KeyError:
pass
try:
display_as = int(attrs["display"])
# check if these pointers need to be remapped
# and set the name attributes
if display_as in self.name_formats_map: if display_as in self.name_formats_map:
self.name.sort_as = self.name_formats_map[display_as] self.name.sort_as = self.name_formats_map[display_as]
else: else: