Exploit new iter_<objects> methods

svn: r13209
This commit is contained in:
Gerald Britton
2009-09-15 19:37:23 +00:00
parent eb8ef2152b
commit 4b77831f0f
5 changed files with 72 additions and 79 deletions

View File

@@ -81,12 +81,11 @@ class StatsGramplet(Gramplet):
notfound = []
pobjects = database.get_number_of_media_objects()
for photo_id in database.get_media_object_handles():
photo = database.get_object_from_handle(photo_id)
for photo in database.iter_media_objects():
fullname = media_path_full(database, photo.get_path())
try:
bytes += posixpath.getsize(fullname)
except:
except OSError:
notfound.append(photo.get_path())
for cnt, person in enumerate(personList):
@@ -97,7 +96,7 @@ class StatsGramplet(Gramplet):
names = [person.get_primary_name()] + person.get_alternate_names()
for name in names:
if name.get_first_name() == "" or name.get_group_name() == "":
if (name.get_first_name() or name.get_group_name()) == "":
incomp_names += 1
if name.get_group_name() not in namelist:
namelist.append(name.get_group_name())

View File

@@ -81,15 +81,14 @@ def run(database, document, main_event):
yeartab.columns(_("Date"), _("Type"), _("Place"), _("Reference"))
histab.columns(_("Date"), _("Type"), _("Place"), _("Reference"))
for event_handle in database.get_event_handles():
event = database.get_event_from_handle(event_handle)
for event in database.iter_events():
date = event.get_date_object()
if date.get_year() == 0:
continue
if (date.get_year() == main_date.get_year() and
date.get_month() == main_date.get_month() and
date.get_day() == main_date.get_day()):
for (objclass, handle) in database.find_backlink_handles(event_handle):
for (objclass, handle) in database.find_backlink_handles(event.handle):
ref = get_ref(database, objclass, handle)
stab.row(date,
sdb.event_type(event),
@@ -97,13 +96,13 @@ def run(database, document, main_event):
elif (date.get_month() == main_date.get_month() and
date.get_day() == main_date.get_day() and
date.get_month() != 0):
for (objclass, handle) in database.find_backlink_handles(event_handle):
for (objclass, handle) in database.find_backlink_handles(event.handle):
ref = get_ref(database, objclass, handle)
histab.row(date,
sdb.event_type(event),
sdb.event_place(event), ref)
elif (date.get_year() == main_date.get_year()):
for (objclass, handle) in database.find_backlink_handles(event_handle):
for (objclass, handle) in database.find_backlink_handles(event.handle):
ref = get_ref(database, objclass, handle)
yeartab.row(date,
sdb.event_type(event),