From 1bffd5f2f03bd2a252b5b08a22b272b0e8bc1048 Mon Sep 17 00:00:00 2001 From: Doug Blank Date: Mon, 18 Jun 2012 12:29:30 +0000 Subject: [PATCH] Fixed has_gramps_id, removed dup methods svn: r19861 --- src/webapp/dbdjango.py | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/src/webapp/dbdjango.py b/src/webapp/dbdjango.py index 22ec9dc43..227c38c7f 100644 --- a/src/webapp/dbdjango.py +++ b/src/webapp/dbdjango.py @@ -681,12 +681,6 @@ class DbDjango(DbWriteBase, DbReadBase): return None return self.make_media(media) - def get_media_object_handles(self): - return [media.handle for media in self.dji.Media.all()] - - def get_person_handles(self, sort_handles=False): - return [person.handle for person in self.dji.Person.all()] - def get_default_person(self): return None @@ -770,8 +764,20 @@ class DbDjango(DbWriteBase, DbReadBase): def get_source_cursor(self): return Cursor(self.dji.Source, self.get_raw_source_data).iter() - def has_gramps_id(self, key, gramps_id): - return self.dji.Person.filter(gramps_id=gramps_id).count() > 0 + def has_gramps_id(self, obj_key, gramps_id): + key2table = { + PERSON_KEY: self.Person, + FAMILY_KEY: self.Family, + SOURCE_KEY: self.Source, + CITATION_KEY: self.Citation, + EVENT_KEY: self.Event, + MEDIA_KEY: self.Media, + PLACE_KEY: self.Place, + REPOSITORY_KEY: self.Repository, + NOTE_KEY: self.Note, + } + table = key2table[obj_key] + return table.objects.filter(gramps_id=gramps_id).count() > 0 def has_person_handle(self, handle): if handle in self.import_cache: