Implement iter_people_handles methods and begin to use them

svn: r12760
This commit is contained in:
Gerald Britton
2009-07-03 20:23:41 +00:00
parent 40d0605a63
commit f7454de7fd
44 changed files with 217 additions and 160 deletions

View File

@@ -185,7 +185,7 @@ class PackageWriter(object):
p.set_media_list(nl)
self.db.commit_family(p, None)
for key in self.db.get_person_handles(sort_handles=False):
for key in self.db.iter_person_handles():
p = self.db.get_person_from_handle(key)
nl = p.get_media_list()
for o in nl:

View File

@@ -254,7 +254,7 @@ class CSVWriter(object):
if not option_box.cfilter.is_empty():
self.db = gen.proxy.FilterProxyDb(self.db, option_box.cfilter)
for p in self.db.get_person_handles(sort_handles=False):
for p in self.db.iter_person_handles():
self.plist[p] = 1
# get the families for which these people are spouses:
self.flist = {}

View File

@@ -144,14 +144,15 @@ class FtreeWriter(object):
self.restrict = self.option_box.restrict
if self.option_box.cfilter is None:
for p in self.db.get_person_handles(sort_handles=False):
self.plist[p] = 1
self.plist.update((p,1)
for p in self.db.iter_person_handles())
else:
try:
for p in self.option_box.cfilter.apply(
self.db, self.db.get_person_handles(sort_handles=False)
):
self.plist[p] = 1
self.plist.update((p,1)
for p in self.option_box.cfilter.apply(
self.db, self.db.iter_person_handles()))
except Errors.FilterError, msg:
(m1, m2) = msg.messages()
ErrorDialog(m1, m2)
@@ -169,8 +170,8 @@ class FtreeWriter(object):
def cl_setup(self):
self.restrict = True
for p in self.db.get_person_handles(sort_handles=False):
self.plist[p] = 1
self.plist.update((p,1)
for p in self.db.iter_person_handles())
def export_data(self):
name_map = {}

View File

@@ -413,7 +413,6 @@ class GedcomWriter(BasicUtils.UpdateCallback):
self.dirname = os.path.dirname (filename)
self.gedcom_file = open(filename, "w")
self.__header(filename)
self.__submitter()
self.__individuals()
@@ -574,8 +573,8 @@ class GedcomWriter(BasicUtils.UpdateCallback):
self.reset(_("Writing individuals"))
self.progress_cnt += 1
self.update(self.progress_cnt)
phandles = self.dbase.get_person_handles()
phandles = self.dbase.iter_person_handles()
sorted_list = []
for handle in phandles:
person = self.dbase.get_person_from_handle(handle)

View File

@@ -174,7 +174,7 @@ class GeneWebWriter(object):
if not option_box.cfilter.is_empty():
self.db = gen.proxy.FilterProxyDb(self.db, option_box.cfilter)
for p in self.db.get_person_handles(sort_handles=False):
for p in self.db.iter_person_handles():
self.plist[p] = 1
self.flist = {}

View File

@@ -122,7 +122,7 @@ class PackageWriter(object):
nl.remove(o)
p.set_media_list(nl)
self.db.commit_family(p,None)
for key in self.db.get_person_handles(sort_handles=False):
for key in self.db.iter_person_handles():
p = self.db.get_person_from_handle(key)
nl = p.get_media_list()
for o in nl:

View File

@@ -145,12 +145,12 @@ class CalendarWriter(object):
self.option_box.parse_options()
if self.option_box.cfilter is None:
for p in self.db.get_person_handles(sort_handles=False):
for p in self.db.iter_person_handles():
self.plist[p] = 1
else:
try:
for p in self.option_box.cfilter.apply(self.db,
self.db.get_person_handles(sort_handles=False)):
self.db.iter_person_handles()):
self.plist[p] = 1
except Errors.FilterError, msg:
(m1, m2) = msg.messages()
@@ -174,7 +174,7 @@ class CalendarWriter(object):
self.oldval = newval
def cl_setup(self):
for p in self.db.get_person_handles(sort_handles=False):
for p in self.db.iter_person_handles():
self.plist[p] = 1
self.flist = {}

View File

@@ -136,12 +136,12 @@ class CardWriter(object):
self.option_box.parse_options()
if self.option_box.cfilter is None:
for p in self.db.get_person_handles(sort_handles=False):
for p in self.db.iter_person_handles():
self.plist[p] = 1
else:
try:
for p in self.option_box.cfilter.apply(self.db,
self.db.get_person_handles(sort_handles=False)):
self.db.iter_person_handles()):
self.plist[p] = 1
except Errors.FilterError, msg:
(m1, m2) = msg.messages()
@@ -159,7 +159,7 @@ class CardWriter(object):
self.oldval = newval
def cl_setup(self):
for p in self.db.get_person_handles(sort_handles=False):
for p in self.db.iter_person_handles():
self.plist[p] = 1
def writeln(self, text):