From 5c28d739ea835a545c0861dd9519eaff2075e8e0 Mon Sep 17 00:00:00 2001 From: Nick Hall Date: Fri, 14 Oct 2016 23:26:41 +0100 Subject: [PATCH] 9743: Tidy up has_*_gramps_id methods Renamed from has_gramps_id_for_* methods. --- gramps/gen/db/generic.py | 32 +++++------------ gramps/plugins/db/dbapi/dbapi.py | 60 ++++++++++++++++++-------------- 2 files changed, 42 insertions(+), 50 deletions(-) diff --git a/gramps/gen/db/generic.py b/gramps/gen/db/generic.py index de0a4458c..f4cf382e9 100644 --- a/gramps/gen/db/generic.py +++ b/gramps/gen/db/generic.py @@ -473,7 +473,7 @@ class DbGeneric(DbWriteBase, DbReadBase, UpdateCallback, Callback): "iter_func": self.iter_people, "ids_func": self.get_person_gramps_ids, "has_handle_func": self.has_person_handle, - "has_gramps_id_func": self.has_gramps_id_for_person, + "has_gramps_id_func": self.has_person_gramps_id, "count_func": self.get_number_of_people, "raw_func": self.get_raw_person_data, "raw_id_func": self._get_raw_person_from_id_data, @@ -491,7 +491,7 @@ class DbGeneric(DbWriteBase, DbReadBase, UpdateCallback, Callback): "iter_func": self.iter_families, "ids_func": self.get_family_gramps_ids, "has_handle_func": self.has_family_handle, - "has_gramps_id_func": self.has_gramps_id_for_family, + "has_gramps_id_func": self.has_family_gramps_id, "count_func": self.get_number_of_families, "raw_func": self.get_raw_family_data, "raw_id_func": self._get_raw_family_from_id_data, @@ -509,7 +509,7 @@ class DbGeneric(DbWriteBase, DbReadBase, UpdateCallback, Callback): "iter_func": self.iter_sources, "ids_func": self.get_source_gramps_ids, "has_handle_func": self.has_source_handle, - "has_gramps_id_func": self.has_gramps_id_for_source, + "has_gramps_id_func": self.has_source_gramps_id, "count_func": self.get_number_of_sources, "raw_func": self.get_raw_source_data, "raw_id_func": self._get_raw_source_from_id_data, @@ -527,7 +527,7 @@ class DbGeneric(DbWriteBase, DbReadBase, UpdateCallback, Callback): "iter_func": self.iter_citations, "ids_func": self.get_citation_gramps_ids, "has_handle_func": self.has_citation_handle, - "has_gramps_id_func": self.has_gramps_id_for_citation, + "has_gramps_id_func": self.has_citation_gramps_id, "count_func": self.get_number_of_citations, "raw_func": self.get_raw_citation_data, "raw_id_func": self._get_raw_citation_from_id_data, @@ -545,7 +545,7 @@ class DbGeneric(DbWriteBase, DbReadBase, UpdateCallback, Callback): "iter_func": self.iter_events, "ids_func": self.get_event_gramps_ids, "has_handle_func": self.has_event_handle, - "has_gramps_id_func": self.has_gramps_id_for_event, + "has_gramps_id_func": self.has_event_gramps_id, "count_func": self.get_number_of_events, "raw_func": self.get_raw_event_data, "raw_id_func": self._get_raw_event_from_id_data, @@ -563,7 +563,7 @@ class DbGeneric(DbWriteBase, DbReadBase, UpdateCallback, Callback): "iter_func": self.iter_media, "ids_func": self.get_media_gramps_ids, "has_handle_func": self.has_media_handle, - "has_gramps_id_func": self.has_gramps_id_for_media, + "has_gramps_id_func": self.has_media_gramps_id, "count_func": self.get_number_of_media, "raw_func": self.get_raw_media_data, "raw_id_func": self._get_raw_media_from_id_data, @@ -581,7 +581,7 @@ class DbGeneric(DbWriteBase, DbReadBase, UpdateCallback, Callback): "iter_func": self.iter_places, "ids_func": self.get_place_gramps_ids, "has_handle_func": self.has_place_handle, - "has_gramps_id_func": self.has_gramps_id_for_place, + "has_gramps_id_func": self.has_place_gramps_id, "count_func": self.get_number_of_places, "raw_func": self.get_raw_place_data, "raw_id_func": self._get_raw_place_from_id_data, @@ -599,7 +599,7 @@ class DbGeneric(DbWriteBase, DbReadBase, UpdateCallback, Callback): "iter_func": self.iter_repositories, "ids_func": self.get_repository_gramps_ids, "has_handle_func": self.has_repository_handle, - "has_gramps_id_func": self.has_gramps_id_for_repository, + "has_gramps_id_func": self.has_repository_gramps_id, "count_func": self.get_number_of_repositories, "raw_func": self.get_raw_repository_data, "raw_id_func": self._get_raw_repository_from_id_data, @@ -617,7 +617,7 @@ class DbGeneric(DbWriteBase, DbReadBase, UpdateCallback, Callback): "iter_func": self.iter_notes, "ids_func": self.get_note_gramps_ids, "has_handle_func": self.has_note_handle, - "has_gramps_id_func": self.has_gramps_id_for_note, + "has_gramps_id_func": self.has_note_gramps_id, "count_func": self.get_number_of_notes, "raw_func": self.get_raw_note_data, "raw_id_func": self._get_raw_note_from_id_data, @@ -1409,20 +1409,6 @@ class DbGeneric(DbWriteBase, DbReadBase, UpdateCallback, Callback): def get_source_cursor(self): return Cursor(self.source_map) - def has_gramps_id(self, obj_key, gramps_id): - key2table = { - PERSON_KEY: self.person_id_map, - FAMILY_KEY: self.family_id_map, - SOURCE_KEY: self.source_id_map, - CITATION_KEY: self.citation_id_map, - EVENT_KEY: self.event_id_map, - MEDIA_KEY: self.media_id_map, - PLACE_KEY: self.place_id_map, - REPOSITORY_KEY: self.repository_id_map, - NOTE_KEY: self.note_id_map, - } - return gramps_id in key2table[obj_key] - def add_person(self, person, trans, set_gid=True): if not person.handle: person.handle = create_id() diff --git a/gramps/plugins/db/dbapi/dbapi.py b/gramps/plugins/db/dbapi/dbapi.py index 5c01c8305..3832e65be 100644 --- a/gramps/plugins/db/dbapi/dbapi.py +++ b/gramps/plugins/db/dbapi/dbapi.py @@ -1580,42 +1580,48 @@ class DBAPI(DbGeneric): self.dbapi.execute("SELECT 1 FROM tag WHERE handle = ?", [key]) return self.dbapi.fetchone() != None - def has_gramps_id_for_person(self, key): - self.dbapi.execute("SELECT 1 FROM person WHERE gramps_id = ?", [key]) + def has_gramps_id(self, obj_key, gramps_id): + key2table = { + PERSON_KEY: 'person', + FAMILY_KEY: 'family', + SOURCE_KEY: 'source', + CITATION_KEY: 'citation', + EVENT_KEY: 'event', + MEDIA_KEY: 'media', + PLACE_KEY: 'place', + REPOSITORY_KEY: 'repository', + NOTE_KEY: 'note', + } + sql = "SELECT 1 FROM %s WHERE gramps_id = ?" % key2table[obj_key] + self.dbapi.execute(sql, [gramps_id]) return self.dbapi.fetchone() != None - def has_gramps_id_for_family(self, key): - self.dbapi.execute("SELECT 1 FROM family WHERE gramps_id = ?", [key]) - return self.dbapi.fetchone() != None + def has_person_gramps_id(self, gramps_id): + return self.has_gramps_id(PERSON_KEY, gramps_id) - def has_gramps_id_for_source(self, key): - self.dbapi.execute("SELECT 1 FROM source WHERE gramps_id = ?", [key]) - return self.dbapi.fetchone() != None + def has_family_gramps_id(self, gramps_id): + return self.has_gramps_id(FAMILY_KEY, gramps_id) - def has_gramps_id_for_citation(self, key): - self.dbapi.execute("SELECT 1 FROM citation WHERE gramps_id = ?", [key]) - return self.dbapi.fetchone() != None + def has_source_gramps_id(self, gramps_id): + return self.has_gramps_id(SOURCE_KEY, gramps_id) - def has_gramps_id_for_event(self, key): - self.dbapi.execute("SELECT 1 FROM event WHERE gramps_id = ?", [key]) - return self.dbapi.fetchone() != None + def has_citation_gramps_id(self, gramps_id): + return self.has_gramps_id(CITATION_KEY, gramps_id) - def has_gramps_id_for_media(self, key): - self.dbapi.execute("SELECT 1 FROM media WHERE gramps_id = ?", [key]) - return self.dbapi.fetchone() != None + def has_event_gramps_id(self, gramps_id): + return self.has_gramps_id(EVENT_KEY, gramps_id) - def has_gramps_id_for_place(self, key): - self.dbapi.execute("SELECT 1 FROM place WHERE gramps_id = ?", [key]) - return self.dbapi.fetchone() != None + def has_media_gramps_id(self, gramps_id): + return self.has_gramps_id(MEDIA_KEY, gramps_id) - def has_gramps_id_for_repository(self, key): - self.dbapi.execute( - "SELECT 1 FROM repository WHERE gramps_id = ?", [key]) - return self.dbapi.fetchone() != None + def has_place_gramps_id(self, gramps_id): + return self.has_gramps_id(PLACE_KEY, gramps_id) - def has_gramps_id_for_note(self, key): - self.dbapi.execute("SELECT 1 FROM note WHERE gramps_id = ?", [key]) - return self.dbapi.fetchone() != None + def has_repository_gramps_id(self, gramps_id): + return self.has_gramps_id(REPOSITORY_KEY, gramps_id) + + def has_note_gramps_id(self, gramps_id): + return self.has_gramps_id(NOTE_KEY, gramps_id) def get_person_gramps_ids(self): self.dbapi.execute("SELECT gramps_id FROM person;")