* src/PeopleModel.py: Correct column numbers.
* src/GrampsDb/_ReadGedcom.py (parse_header_source): Typo. * src/RelLib/_RepoRef.py (unserialize): Return unserialized object. svn: r5881
This commit is contained in:
parent
01a5806681
commit
c0fdb8ad27
@ -16,6 +16,10 @@
|
||||
* src/Makefile.am: Remove absent glade files from the list.
|
||||
* src/GrampsDb/Makefile.am: Ship new glade files; correct directory.
|
||||
|
||||
* src/PeopleModel.py: Correct column numbers.
|
||||
* src/GrampsDb/_ReadGedcom.py (parse_header_source): Typo.
|
||||
* src/RelLib/_RepoRef.py (unserialize): Return unserialized object.
|
||||
|
||||
2006-02-03 Richard Taylor <rjt-gramps@thegrindstone.me.uk>
|
||||
* src/TreeViews/_PersonTreeView.py: added more columns
|
||||
|
||||
|
@ -1760,7 +1760,7 @@ class GedcomParser:
|
||||
self.def_src.set_data_item('Creation date',matches[2])
|
||||
elif matches[1] == TOKEN_NOTE:
|
||||
note = matches[2]
|
||||
elif matches[1][0] == TOKEN_UNKNOWN:
|
||||
elif matches[1] == TOKEN_UNKNOWN:
|
||||
self.ignore_sub_junk(2)
|
||||
else:
|
||||
self.barf(2)
|
||||
|
@ -77,8 +77,8 @@ _DEATH_COL = 6
|
||||
_BIRTH_COL = 7
|
||||
_EVENT_COL = 8
|
||||
_FAMILY_COL= 9
|
||||
_CHANGE_COL= 20
|
||||
_MARKER_COL=21
|
||||
_CHANGE_COL= 19
|
||||
_MARKER_COL= 20
|
||||
|
||||
#-------------------------------------------------------------------------
|
||||
#
|
||||
@ -443,7 +443,7 @@ class PeopleModel(gtk.GenericTreeModel):
|
||||
if data[_MARKER_COL]:
|
||||
if data[_MARKER_COL][0] == PrimaryObject.MARKER_CUSTOM:
|
||||
return data[_MARKER_COL][1]
|
||||
elif data[_MARKER_COL][0] in Utils.marker_types:
|
||||
elif data[_MARKER_COL][0] in Utils.marker_types.keys():
|
||||
return Utils.marker_types[data[_MARKER_COL][0]]
|
||||
except IndexError:
|
||||
return ""
|
||||
|
@ -76,6 +76,7 @@ class RepoRef(BaseObject,NoteBase):
|
||||
def unserialize(self,data):
|
||||
(note,self.ref,self.call_number,self.media_type) = data
|
||||
NoteBase.unserialize(self,note)
|
||||
return self
|
||||
|
||||
def get_text_data_list(self):
|
||||
"""
|
||||
|
Loading…
Reference in New Issue
Block a user