From 7b133023ed68d3fc14270efb1028c6e9d894cef1 Mon Sep 17 00:00:00 2001 From: Doug Blank Date: Wed, 11 Jul 2012 01:41:52 +0000 Subject: [PATCH] Added handles_func to db._tables, and added sort to get_X_handles methods in DictionaryDb svn: r19983 --- src/gen/db/dictionary.py | 147 ++++++++++++++++++++++++++++++++++----- src/gen/db/read.py | 11 ++- 2 files changed, 139 insertions(+), 19 deletions(-) diff --git a/src/gen/db/dictionary.py b/src/gen/db/dictionary.py index 2be873609..9cb9051fb 100644 --- a/src/gen/db/dictionary.py +++ b/src/gen/db/dictionary.py @@ -42,6 +42,8 @@ from gen.db import (PERSON_KEY, REPOSITORY_KEY, NOTE_KEY) from gen.utils.id import create_id +from gen.lib import (MediaObject, Person, Family, Source, Citation, Event, + Place, Repository, Note, Tag) class Cursor(object): """ @@ -96,6 +98,88 @@ class DictionaryDb(DbWriteBase, DbReadBase): def __init__(self, *args, **kwargs): DbReadBase.__init__(self) DbWriteBase.__init__(self) + self._tables = { + 'Person': + { + "handle_func": self.get_person_from_handle, + "gramps_id_func": self.get_person_from_gramps_id, + "class_func": Person, + "cursor_func": self.get_person_cursor, + "handles_func": self.get_person_handles, + }, + 'Family': + { + "handle_func": self.get_family_from_handle, + "gramps_id_func": self.get_family_from_gramps_id, + "class_func": Family, + "cursor_func": self.get_family_cursor, + "handles_func": self.get_family_handles, + }, + 'Source': + { + "handle_func": self.get_source_from_handle, + "gramps_id_func": self.get_source_from_gramps_id, + "class_func": Source, + "cursor_func": self.get_source_cursor, + "handles_func": self.get_source_handles, + }, + 'Citation': + { + "handle_func": self.get_citation_from_handle, + "gramps_id_func": self.get_citation_from_gramps_id, + "class_func": Citation, + "cursor_func": self.get_citation_cursor, + "handles_func": self.get_citation_handles, + }, + 'Event': + { + "handle_func": self.get_event_from_handle, + "gramps_id_func": self.get_event_from_gramps_id, + "class_func": Event, + "cursor_func": self.get_event_cursor, + "handles_func": self.get_event_handles, + }, + 'Media': + { + "handle_func": self.get_object_from_handle, + "gramps_id_func": self.get_object_from_gramps_id, + "class_func": MediaObject, + "cursor_func": self.get_media_cursor, + "handles_func": self.get_media_object_handles, + }, + 'Place': + { + "handle_func": self.get_place_from_handle, + "gramps_id_func": self.get_place_from_gramps_id, + "class_func": Place, + "cursor_func": self.get_place_cursor, + "handles_func": self.get_place_handles, + }, + 'Repository': + { + "handle_func": self.get_repository_from_handle, + "gramps_id_func": self.get_repository_from_gramps_id, + "class_func": Repository, + "cursor_func": self.get_repository_cursor, + "handles_func": self.get_repository_handles, + }, + 'Note': + { + "handle_func": self.get_note_from_handle, + "gramps_id_func": self.get_note_from_gramps_id, + "class_func": Note, + "cursor_func": self.get_note_cursor, + "handles_func": self.get_note_handles, + }, + 'Tag': + { + "handle_func": self.get_tag_from_handle, + "gramps_id_func": None, + "class_func": Tag, + "cursor_func": self.get_tag_cursor, + "handles_func": self.get_tag_handles, + }, + } # skip GEDCOM cross-ref check for now: self.set_feature("skip-check-xref", True) self.readonly = False @@ -419,32 +503,59 @@ class DictionaryDb(DbWriteBase, DbReadBase): obj = gen.lib.Researcher() return obj - def get_person_handles(self): - return self.person_map.keys() + def get_person_handles(self, sort_handles=False): + if sort_handles: + return sorted(self.person_map.keys()) + else: + return self.person_map.keys() - def get_family_handles(self): - return self.family_map.keys() + def get_family_handles(self, sort_handles=False): + if sort_handles: + return sorted(self.family_map.keys()) + else: + return self.family_map.keys() - def get_event_handles(self): - return self.event_map.keys() + def get_event_handles(self, sort_handles=False): + if sort_handles: + return sorted(self.event_map.keys()) + else: + return self.event_map.keys() - def get_citation_handles(self): - return self.citation_map.keys() + def get_citation_handles(self, sort_handles=False): + if sort_handles: + return sorted(self.citation_map.keys()) + else: + return self.citation_map.keys() - def get_source_handles(self): - return self.source_map.keys() + def get_source_handles(self, sort_handles=False): + if sort_handles: + return sorted(self.source_map.keys()) + else: + return self.source_map.keys() - def get_place_handles(self): - return self.place_map.keys() + def get_place_handles(self, sort_handles=False): + if sort_handles: + return sorted(self.place_map.keys()) + else: + return self.place_map.keys() - def get_repository_handles(self): - return self.repository_map.keys() + def get_repository_handles(self, sort_handles=False): + if sort_handles: + return sorted(self.repository_map.keys()) + else: + return self.repository_map.keys() - def get_media_object_handles(self): - return self.media_map.keys() + def get_media_object_handles(self, sort_handles=False): + if sort_handles: + return sorted(self.media_map.keys()) + else: + return self.media_map.keys() - def get_note_handles(self): - return self.note_map.keys() + def get_note_handles(self, sort_handles=False): + if sort_handles: + return sorted(self.note_map.keys()) + else: + return self.note_map.keys() def get_tag_handles(self, sort_handles=False): return [] diff --git a/src/gen/db/read.py b/src/gen/db/read.py index e879d1a33..55e1abf65 100644 --- a/src/gen/db/read.py +++ b/src/gen/db/read.py @@ -221,7 +221,6 @@ class DbBsddbRead(DbReadBase, Callback): """ DbReadBase.__init__(self) Callback.__init__(self) - self._tables = { 'Person': { @@ -229,6 +228,7 @@ class DbBsddbRead(DbReadBase, Callback): "gramps_id_func": self.get_person_from_gramps_id, "class_func": Person, "cursor_func": self.get_person_cursor, + "handles_func": self.get_person_handles, }, 'Family': { @@ -236,6 +236,7 @@ class DbBsddbRead(DbReadBase, Callback): "gramps_id_func": self.get_family_from_gramps_id, "class_func": Family, "cursor_func": self.get_family_cursor, + "handles_func": self.get_family_handles, }, 'Source': { @@ -243,6 +244,7 @@ class DbBsddbRead(DbReadBase, Callback): "gramps_id_func": self.get_source_from_gramps_id, "class_func": Source, "cursor_func": self.get_source_cursor, + "handles_func": self.get_source_handles, }, 'Citation': { @@ -250,6 +252,7 @@ class DbBsddbRead(DbReadBase, Callback): "gramps_id_func": self.get_citation_from_gramps_id, "class_func": Citation, "cursor_func": self.get_citation_cursor, + "handles_func": self.get_citation_handles, }, 'Event': { @@ -257,6 +260,7 @@ class DbBsddbRead(DbReadBase, Callback): "gramps_id_func": self.get_event_from_gramps_id, "class_func": Event, "cursor_func": self.get_event_cursor, + "handles_func": self.get_event_handles, }, 'Media': { @@ -264,6 +268,7 @@ class DbBsddbRead(DbReadBase, Callback): "gramps_id_func": self.get_object_from_gramps_id, "class_func": MediaObject, "cursor_func": self.get_media_cursor, + "handles_func": self.get_media_object_handles, }, 'Place': { @@ -271,6 +276,7 @@ class DbBsddbRead(DbReadBase, Callback): "gramps_id_func": self.get_place_from_gramps_id, "class_func": Place, "cursor_func": self.get_place_cursor, + "handles_func": self.get_place_handles, }, 'Repository': { @@ -278,6 +284,7 @@ class DbBsddbRead(DbReadBase, Callback): "gramps_id_func": self.get_repository_from_gramps_id, "class_func": Repository, "cursor_func": self.get_repository_cursor, + "handles_func": self.get_repository_handles, }, 'Note': { @@ -285,6 +292,7 @@ class DbBsddbRead(DbReadBase, Callback): "gramps_id_func": self.get_note_from_gramps_id, "class_func": Note, "cursor_func": self.get_note_cursor, + "handles_func": self.get_note_handles, }, 'Tag': { @@ -292,6 +300,7 @@ class DbBsddbRead(DbReadBase, Callback): "gramps_id_func": None, "class_func": Tag, "cursor_func": self.get_tag_cursor, + "handles_func": self.get_tag_handles, }, }