Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added handles_func to db._tables, and added sort to get_X_handles methods in DictionaryDb

Browse Source 
svn: r19983
This commit is contained in:
Doug Blank 2012-07-11 01:41:52 +00:00
parent 1f0dc4f799
commit 7b133023ed
2 changed files with 139 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

147
src/gen/db/dictionary.py
View File

@ -42,6 +42,8 @@ from gen.db import (PERSON_KEY,
REPOSITORY_KEY, REPOSITORY_KEY,
NOTE_KEY) NOTE_KEY)
from gen.utils.id import create_id from gen.utils.id import create_id
from gen.lib import (MediaObject, Person, Family, Source, Citation, Event,
Place, Repository, Note, Tag)
class Cursor(object): class Cursor(object):
""" """
@ -96,6 +98,88 @@ class DictionaryDb(DbWriteBase, DbReadBase):
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
DbReadBase.__init__(self) DbReadBase.__init__(self)
DbWriteBase.__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: # skip GEDCOM cross-ref check for now:
self.set_feature("skip-check-xref", True) self.set_feature("skip-check-xref", True)
self.readonly = False self.readonly = False
@ -419,32 +503,59 @@ class DictionaryDb(DbWriteBase, DbReadBase):
obj = gen.lib.Researcher() obj = gen.lib.Researcher()
return obj return obj
def get_person_handles(self): def get_person_handles(self, sort_handles=False):
return self.person_map.keys() if sort_handles:
return sorted(self.person_map.keys())
else:
return self.person_map.keys()
def get_family_handles(self): def get_family_handles(self, sort_handles=False):
return self.family_map.keys() if sort_handles:
return sorted(self.family_map.keys())
else:
return self.family_map.keys()
def get_event_handles(self): def get_event_handles(self, sort_handles=False):
return self.event_map.keys() if sort_handles:
return sorted(self.event_map.keys())
else:
return self.event_map.keys()
def get_citation_handles(self): def get_citation_handles(self, sort_handles=False):
return self.citation_map.keys() if sort_handles:
return sorted(self.citation_map.keys())
else:
return self.citation_map.keys()
def get_source_handles(self): def get_source_handles(self, sort_handles=False):
return self.source_map.keys() if sort_handles:
return sorted(self.source_map.keys())
else:
return self.source_map.keys()
def get_place_handles(self): def get_place_handles(self, sort_handles=False):
return self.place_map.keys() if sort_handles:
return sorted(self.place_map.keys())
else:
return self.place_map.keys()
def get_repository_handles(self): def get_repository_handles(self, sort_handles=False):
return self.repository_map.keys() if sort_handles:
return sorted(self.repository_map.keys())
else:
return self.repository_map.keys()
def get_media_object_handles(self): def get_media_object_handles(self, sort_handles=False):
return self.media_map.keys() if sort_handles:
return sorted(self.media_map.keys())
else:
return self.media_map.keys()
def get_note_handles(self): def get_note_handles(self, sort_handles=False):
return self.note_map.keys() if sort_handles:
return sorted(self.note_map.keys())
else:
return self.note_map.keys()
def get_tag_handles(self, sort_handles=False): def get_tag_handles(self, sort_handles=False):
return [] return []

11
src/gen/db/read.py
View File

@ -221,7 +221,6 @@ class DbBsddbRead(DbReadBase, Callback):
""" """
DbReadBase.__init__(self) DbReadBase.__init__(self)
Callback.__init__(self) Callback.__init__(self)
self._tables = { self._tables = {
'Person': 'Person':
{ {
@ -229,6 +228,7 @@ class DbBsddbRead(DbReadBase, Callback):
"gramps_id_func": self.get_person_from_gramps_id, "gramps_id_func": self.get_person_from_gramps_id,
"class_func": Person, "class_func": Person,
"cursor_func": self.get_person_cursor, "cursor_func": self.get_person_cursor,
"handles_func": self.get_person_handles,
}, },
'Family': 'Family':
{ {
@ -236,6 +236,7 @@ class DbBsddbRead(DbReadBase, Callback):
"gramps_id_func": self.get_family_from_gramps_id, "gramps_id_func": self.get_family_from_gramps_id,
"class_func": Family, "class_func": Family,
"cursor_func": self.get_family_cursor, "cursor_func": self.get_family_cursor,
"handles_func": self.get_family_handles,
}, },
'Source': 'Source':
{ {
@ -243,6 +244,7 @@ class DbBsddbRead(DbReadBase, Callback):
"gramps_id_func": self.get_source_from_gramps_id, "gramps_id_func": self.get_source_from_gramps_id,
"class_func": Source, "class_func": Source,
"cursor_func": self.get_source_cursor, "cursor_func": self.get_source_cursor,
"handles_func": self.get_source_handles,
}, },
'Citation': 'Citation':
{ {
@ -250,6 +252,7 @@ class DbBsddbRead(DbReadBase, Callback):
"gramps_id_func": self.get_citation_from_gramps_id, "gramps_id_func": self.get_citation_from_gramps_id,
"class_func": Citation, "class_func": Citation,
"cursor_func": self.get_citation_cursor, "cursor_func": self.get_citation_cursor,
"handles_func": self.get_citation_handles,
}, },
'Event': 'Event':
{ {
@ -257,6 +260,7 @@ class DbBsddbRead(DbReadBase, Callback):
"gramps_id_func": self.get_event_from_gramps_id, "gramps_id_func": self.get_event_from_gramps_id,
"class_func": Event, "class_func": Event,
"cursor_func": self.get_event_cursor, "cursor_func": self.get_event_cursor,
"handles_func": self.get_event_handles,
}, },
'Media': 'Media':
{ {
@ -264,6 +268,7 @@ class DbBsddbRead(DbReadBase, Callback):
"gramps_id_func": self.get_object_from_gramps_id, "gramps_id_func": self.get_object_from_gramps_id,
"class_func": MediaObject, "class_func": MediaObject,
"cursor_func": self.get_media_cursor, "cursor_func": self.get_media_cursor,
"handles_func": self.get_media_object_handles,
}, },
'Place': 'Place':
{ {
@ -271,6 +276,7 @@ class DbBsddbRead(DbReadBase, Callback):
"gramps_id_func": self.get_place_from_gramps_id, "gramps_id_func": self.get_place_from_gramps_id,
"class_func": Place, "class_func": Place,
"cursor_func": self.get_place_cursor, "cursor_func": self.get_place_cursor,
"handles_func": self.get_place_handles,
}, },
'Repository': 'Repository':
{ {
@ -278,6 +284,7 @@ class DbBsddbRead(DbReadBase, Callback):
"gramps_id_func": self.get_repository_from_gramps_id, "gramps_id_func": self.get_repository_from_gramps_id,
"class_func": Repository, "class_func": Repository,
"cursor_func": self.get_repository_cursor, "cursor_func": self.get_repository_cursor,
"handles_func": self.get_repository_handles,
}, },
'Note': 'Note':
{ {
@ -285,6 +292,7 @@ class DbBsddbRead(DbReadBase, Callback):
"gramps_id_func": self.get_note_from_gramps_id, "gramps_id_func": self.get_note_from_gramps_id,
"class_func": Note, "class_func": Note,
"cursor_func": self.get_note_cursor, "cursor_func": self.get_note_cursor,
"handles_func": self.get_note_handles,
}, },
'Tag': 'Tag':
{ {
@ -292,6 +300,7 @@ class DbBsddbRead(DbReadBase, Callback):
"gramps_id_func": None, "gramps_id_func": None,
"class_func": Tag, "class_func": Tag,
"cursor_func": self.get_tag_cursor, "cursor_func": self.get_tag_cursor,
"handles_func": self.get_tag_handles,
}, },
} }