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

svn: r7837

Browse Source
This commit is contained in:
Don Allingham 2006-12-22 19:24:46 +00:00
parent aa171d3409
commit 5b6b5553ac
2 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/GrampsDb/_WriteXML.py
View File

@ -325,13 +325,13 @@ class XmlWriter(UpdateCallback):
self.g.write("</database>\n")
def write_bookmarks(self):
bm_person_len = len(self.db.bookmarks)
bm_family_len = len(self.db.family_bookmarks)
bm_event_len = len(self.db.event_bookmarks)
bm_source_len = len(self.db.source_bookmarks)
bm_place_len = len(self.db.place_bookmarks)
bm_repo_len = len(self.db.repo_bookmarks)
bm_obj_len = len(self.db.media_bookmarks)
bm_person_len = len(self.db.bookmarks.get())
bm_family_len = len(self.db.family_bookmarks.get())
bm_event_len = len(self.db.event_bookmarks.get())
bm_source_len = len(self.db.source_bookmarks.get())
bm_place_len = len(self.db.place_bookmarks.get())
bm_repo_len = len(self.db.repo_bookmarks.get())
bm_obj_len = len(self.db.media_bookmarks.get())
bm_len = bm_person_len + bm_family_len + bm_event_len \
+ bm_source_len + bm_place_len + bm_repo_len + bm_obj_len
@ -339,25 +339,25 @@ class XmlWriter(UpdateCallback):
if bm_len > 0:
self.g.write(" <bookmarks>\n")
for handle in self.db.get_bookmarks():
for handle in self.db.get_bookmarks().get():
self.g.write(' <bookmark target="person" hlink="_%s"/>\n'
% handle )
for handle in self.db.get_family_bookmarks():
for handle in self.db.get_family_bookmarks().get():
self.g.write(' <bookmark target="family" hlink="_%s"/>\n'
% handle )
for handle in self.db.get_event_bookmarks():
for handle in self.db.get_event_bookmarks().get():
self.g.write(' <bookmark target="event" hlink="_%s"/>\n'
% handle )
for handle in self.db.get_source_bookmarks():
for handle in self.db.get_source_bookmarks().get():
self.g.write(' <bookmark target="source" hlink="_%s"/>\n'
% handle )
for handle in self.db.get_place_bookmarks():
for handle in self.db.get_place_bookmarks().get():
self.g.write(' <bookmark target="place" hlink="_%s"/>\n'
% handle )
for handle in self.db.get_media_bookmarks():
for handle in self.db.get_media_bookmarks().get():
self.g.write(' <bookmark target="media" hlink="_%s"/>\n'
% handle )
for handle in self.db.get_repo_bookmarks():
for handle in self.db.get_repo_bookmarks().get():
self.g.write(' <bookmark target="repository" hlink="_%s"/>\n'
% handle )
self.g.write(" </bookmarks>\n")

4
src/plugins/FindDupes.py
View File

@ -101,9 +101,6 @@ class Merge(Tool.Tool,ManagedWindow.ManagedWindow):
self.update = callback
self.use_soundex = 1
self.family_list = self.db.get_family_handles()[:]
self.person_list = self.db.get_person_handles(sort_handles=False)[:]
base = os.path.dirname(__file__)
self.glade_file = "%s/%s" % (base,"merge.glade")
top = gtk.glade.XML(self.glade_file,"dialog","gramps")
@ -187,6 +184,7 @@ class Merge(Tool.Tool,ManagedWindow.ManagedWindow):
males = {}
females = {}
self.person_list = self.db.get_person_handles(sort_handles=False)
length = len(self.person_list)
self.progress.set_pass(_('Pass 1: Building preliminary lists'),