* src/GrampsParser.py: remove debugging statement

* src/RelLib.py: remove debugging statement
* src/gramps_main.py: If an invalid ID is found while attempting to
access the history, invalidate the history list (set to empty list).
This should only happen after a reordering of IDs.


svn: r2282
This commit is contained in:
Don Allingham 2003-10-23 03:02:52 +00:00
parent 7df344ec86
commit 9ce580c501
4 changed files with 32 additions and 31 deletions

View File

@ -275,7 +275,6 @@ class GrampsParser:
if attrs.has_key('ref'): if attrs.has_key('ref'):
self.witness = RelLib.Witness(RelLib.Event.ID,attrs['ref']) self.witness = RelLib.Witness(RelLib.Event.ID,attrs['ref'])
if attrs.has_key('name'): if attrs.has_key('name'):
print "name",attrs['name']
self.witness = RelLib.Witness(RelLib.Event.NAME,attrs['name']) self.witness = RelLib.Witness(RelLib.Event.NAME,attrs['name'])
def start_coord(self,attrs): def start_coord(self,attrs):

View File

@ -2304,12 +2304,9 @@ class GrampsDB(Persistent):
return self.surnames return self.surnames
def addSurname(self,name): def addSurname(self,name):
try: if name and name not in self.surnames:
if name and name not in self.surnames: self.surnames.append(name)
self.surnames.append(name) self.surnames.sort()
self.surnames.sort()
except:
print name
def getBookmarks(self): def getBookmarks(self):
"""returns the list of Person instances in the bookmarks""" """returns the list of Person instances in the bookmarks"""

View File

@ -397,29 +397,34 @@ class Gramps:
item.show() item.show()
gomenu.append(item) gomenu.append(item)
if len(self.history) > 0: try:
# Draw separator if len(self.history) > 0:
item = gtk.MenuItem() # Draw separator
item.show() item = gtk.MenuItem()
gomenu.append(item) item.show()
gomenu.append(item)
pids = self.mhistory[:] pids = self.mhistory[:]
pids.reverse() pids.reverse()
num = 0 num = 0
haveit = [] haveit = []
for pid in pids: for pid in pids:
if num >= 10: if num >= 10:
break break
if pid not in haveit: if pid not in haveit:
haveit.append(pid) haveit.append(pid)
person = self.db.getPerson(pid) person = self.db.getPerson(pid)
item = gtk.MenuItem("_%d. %s [%s]" % item = gtk.MenuItem("_%d. %s [%s]" %
(num,person.getPrimaryName().getName(),pid)) (num,person.getPrimaryName().getName(),pid))
item.connect("activate",self.bookmark_callback,person) item.connect("activate",self.bookmark_callback,person)
item.show() item.show()
gomenu.append(item) gomenu.append(item)
num = num + 1 num = num + 1
else: else:
self.back.set_sensitive(0)
self.forward.set_sensitive(0)
except:
self.history = []
self.back.set_sensitive(0) self.back.set_sensitive(0)
self.forward.set_sensitive(0) self.forward.set_sensitive(0)