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

* src/ReadGedcom.py: fix mixing note assignment

Browse Source 
* src/PeopleModel.py: streamline display


svn: r5457
This commit is contained in:
Don Allingham 2005-12-01 04:52:16 +00:00
parent e28b703de9
commit 070ce1bde1
3 changed files with 30 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gramps2/ChangeLog
View File

@ -1,3 +1,7 @@
2005-11-30 Don Allingham <don@gramps-project.org>
* src/ReadGedcom.py: fix mixing note assignment
* src/PeopleModel.py: streamline display
2005-11-29 Don Allingham <don@gramps-project.org> 2005-11-29 Don Allingham <don@gramps-project.org>
* src/Relationship.py: limit search depth to 15 generations. * src/Relationship.py: limit search depth to 15 generations.

64
gramps2/src/PeopleModel.py
View File

@ -102,8 +102,6 @@ class PeopleModel(gtk.GenericTreeModel):
gtk.GenericTreeModel.__init__(self) gtk.GenericTreeModel.__init__(self)
self.db = db self.db = db
self.visible = {}
self.top_visible = {}
self.invert_result = invert_result self.invert_result = invert_result
self.sortnames = {} self.sortnames = {}
self.rebuild_data(data_filter) self.rebuild_data(data_filter)
@ -231,12 +229,6 @@ class PeopleModel(gtk.GenericTreeModel):
except: except:
return u'error' return u'error'
def reset_visible(self):
pass
def set_visible(self,node,val):
pass
def on_iter_next(self, node): def on_iter_next(self, node):
'''returns the next node at this level of the tree''' '''returns the next node at this level of the tree'''
try: try:
@ -316,8 +308,8 @@ class PeopleModel(gtk.GenericTreeModel):
def column_change(self,data,node): def column_change(self,data,node):
return unicode(time.strftime(_date_format, return unicode(time.strftime(_date_format,
time.localtime(data[_CHANGE_COL])), time.localtime(data[_CHANGE_COL])),
_codeset) _codeset)
def column_gender(self,data,node): def column_gender(self,data,node):
return _GENDER[data[_GENDER_COL]] return _GENDER[data[_GENDER_COL]]
@ -355,45 +347,37 @@ class PeopleModel(gtk.GenericTreeModel):
return u"" return u""
def column_birth_place(self,data,node): def column_birth_place(self,data,node):
if data[_BIRTH_COL]: data_birth = data[_BIRTH_COL]
event = self.db.get_event_from_handle(data[_BIRTH_COL]) if data_birth:
if event: event = self.db.get_event_from_handle(data_birth)
place_handle = event.get_place_handle() if event and event.place:
if place_handle: place_title = self.db.get_place_from_handle(event.place).title
place_title = self.db.get_place_from_handle(place_handle).get_title() if place_title != "":
if place_title != "": return cgi.escape(place_title)
return cgi.escape(place_title)
for event_handle in data[_EVENT_COL]: for event_handle in data[_EVENT_COL]:
event = self.db.get_event_from_handle(event_handle) event = self.db.get_event_from_handle(event_handle)
if event.name in ["Baptism", "Christening"]: if event.name in ["Baptism", "Christening"] and event.place:
place_handle = event.get_place_handle() place_title = self.db.get_place_from_handle(event.place).title
if place_handle: if place_title != "":
place_title = self.db.get_place_from_handle(place_handle).get_title() return "<i>" + cgi.escape(place_title) + "</i>"
if place_title != "":
return "<i>" + cgi.escape(place_title) + "</i>"
return u"" return u""
def column_death_place(self,data,node): def column_death_place(self,data,node):
if data[_DEATH_COL]: data_death = data[_DEATH_COL]
event = self.db.get_event_from_handle(data[_DEATH_COL]) if data_death:
if event: event = self.db.get_event_from_handle(data_death)
place_handle = event.get_place_handle() if event and event.place:
if place_handle: place_title = self.db.get_place_from_handle(event.place).title
place_title = self.db.get_place_from_handle(place_handle).get_title() if place_title != "":
if place_title != "": return cgi.escape(place_title)
return cgi.escape(place_title)
for event_handle in data[_EVENT_COL]: for event_handle in data[_EVENT_COL]:
event = self.db.get_event_from_handle(event_handle) event = self.db.get_event_from_handle(event_handle)
if event.name in ["Burial", "Cremation"]: if event.name in ["Burial", "Cremation"] and event.place:
place_handle = event.get_place_handle() place_title = self.db.get_place_from_handle(event.place).title
if place_handle: if place_title != "":
place_title = self.db.get_place_from_handle(place_handle).get_title() return "<i>" + cgi.escape(place_title) + "</i>"
if place_title != "":
return "<i>" + cgi.escape(place_title) + "</i>"
return u"" return u""
def column_int_id(self,data,node): def column_int_id(self,data,node):

4
gramps2/src/ReadGedcom.py
View File

@ -653,7 +653,8 @@ class GedcomParser:
def parse_source(self,name,level): def parse_source(self,name,level):
self.source = self.find_or_create_source(name[1:-1]) self.source = self.find_or_create_source(name[1:-1])
while 1: note = ""
while True:
matches = self.get_next() matches = self.get_next()
if int(matches[0]) < level: if int(matches[0]) < level:
if not self.source.get_title(): if not self.source.get_title():
@ -1734,7 +1735,6 @@ class GedcomParser:
source.set_confidence_level(val) source.set_confidence_level(val)
elif matches[1] in ["NOTE","TEXT"]: elif matches[1] in ["NOTE","TEXT"]:
note = self.parse_comment(matches,source,level+1,note) note = self.parse_comment(matches,source,level+1,note)
print note
else: else:
self.barf(level+1) self.barf(level+1)