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

WIP: name_group; clean up of SQL

Browse Source
This commit is contained in:
Doug Blank 2015-05-23 20:25:04 -04:00
parent 1871c6ced4
commit 9274d74dc1
1 changed files with 56 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
gramps/plugins/database/dbapi.py
View File

@ -462,7 +462,12 @@ class DBAPI(DbWriteBase, DbReadBase, UpdateCallback, Callback):
contains_func="has_gramps_id_func") contains_func="has_gramps_id_func")
self.tag_map = Map(Table(self._tables["Tag"])) self.tag_map = Map(Table(self._tables["Tag"]))
self.metadata = Map(Table({"cursor_func": lambda: MetaCursor()})) self.metadata = Map(Table({"cursor_func": lambda: MetaCursor()}))
self.name_group = {} ## FIXME: add appropriate methods:
self.name_group = Map(Table({"handles_func": self.get_name_group_keys, # keys
"has_handle_func": self.has_name_group_key, # key in table
"cursor_func": None, # create a cursor, values
"add_func": self.set_name_group_mapping, # add a key, value
"count_func": None})) # how many items?
self.undo_callback = None self.undo_callback = None
self.redo_callback = None self.redo_callback = None
self.undo_history_callback = None self.undo_history_callback = None
@ -746,10 +751,16 @@ class DBAPI(DbWriteBase, DbReadBase, UpdateCallback, Callback):
return None return None
def get_name_group_keys(self): def get_name_group_keys(self):
return [] cur = self.dbapi.execute("select name from name_group order by name;")
rows = cur.fetchall()
return [row[0] for row in rows]
def get_name_group_mapping(self, key): def get_name_group_mapping(self, key):
return None cur = self.dbapi.execute("select grouping from name_group where name = ?;",
[key])
row = cur.fetchone()
if row:
return row[0]
def get_person_handles(self, sort_handles=False): def get_person_handles(self, sort_handles=False):
if sort_handles: if sort_handles:
@ -1096,12 +1107,22 @@ class DBAPI(DbWriteBase, DbReadBase, UpdateCallback, Callback):
return handle in self.media_map return handle in self.media_map
def has_name_group_key(self, key): def has_name_group_key(self, key):
# FIXME: cur = self.dbapi.execute("select grouping from name_group where name = ?;",
return False [key])
row = cur.fetchone()
return True if row else False
def set_name_group_mapping(self, key, value): def set_name_group_mapping(self, name, grouping):
# FIXME: sname = name.encode("utf-8")
pass cur = self.dbapi.execute("SELECT * from name_group where name = ?;",
[sname])
row = cur.fetchone()
if row:
cur = self.dbapi.execute("DELETE from name_group where name = ?;",
[sname])
cur = self.dbapi.execute("INSERT into name_group (name, grouping) VALUES(?, ?);",
[sname, grouping])
self.dbapi.commit()
def set_default_person_handle(self, handle): def set_default_person_handle(self, handle):
## FIXME ## FIXME
@ -1260,8 +1281,8 @@ class DBAPI(DbWriteBase, DbReadBase, UpdateCallback, Callback):
person.handle]) person.handle])
else: else:
emit = "person-add" emit = "person-add"
self.dbapi.execute("""insert into person(handle, order_by, gramps_id, blob) self.dbapi.execute("""insert into person (handle, order_by, gramps_id, blob)
values(?, ?, ?, ?);""", values(?, ?, ?, ?);""",
[person.handle, [person.handle,
self._order_by_person_key(person), self._order_by_person_key(person),
person.gramps_id, person.gramps_id,
@ -1285,7 +1306,8 @@ class DBAPI(DbWriteBase, DbReadBase, UpdateCallback, Callback):
family.handle]) family.handle])
else: else:
emit = "family-add" emit = "family-add"
self.dbapi.execute("insert into family values(?, ?, ?);", self.dbapi.execute("""insert into family (handle, gramps_id, blob)
values(?, ?, ?);""",
[family.handle, family.gramps_id, [family.handle, family.gramps_id,
pickle.dumps(family.serialize())]) pickle.dumps(family.serialize())])
if not trans.batch: if not trans.batch:
@ -1309,7 +1331,8 @@ class DBAPI(DbWriteBase, DbReadBase, UpdateCallback, Callback):
citation.handle]) citation.handle])
else: else:
emit = "citation-add" emit = "citation-add"
self.dbapi.execute("insert into citation values(?, ?, ?, ?);", self.dbapi.execute("""insert into citation (handle, order_by, gramps_id, blob)
values(?, ?, ?, ?);""",
[citation.handle, [citation.handle,
self._order_by_citation_key(citation), self._order_by_citation_key(citation),
citation.gramps_id, citation.gramps_id,
@ -1335,7 +1358,8 @@ class DBAPI(DbWriteBase, DbReadBase, UpdateCallback, Callback):
source.handle]) source.handle])
else: else:
emit = "source-add" emit = "source-add"
self.dbapi.execute("insert into source values(?, ?, ?, ?);", self.dbapi.execute("""insert into source (handle, order_by, gramps_id, blob)
values(?, ?, ?, ?);""",
[source.handle, [source.handle,
self._order_by_source_key(source), self._order_by_source_key(source),
source.gramps_id, source.gramps_id,
@ -1359,7 +1383,8 @@ class DBAPI(DbWriteBase, DbReadBase, UpdateCallback, Callback):
repository.handle]) repository.handle])
else: else:
emit = "repository-add" emit = "repository-add"
self.dbapi.execute("insert into repository values(?, ?, ?);", self.dbapi.execute("""insert into repository (handle, gramps_id, blob)
values(?, ?, ?);""",
[repository.handle, repository.gramps_id, pickle.dumps(repository.serialize())]) [repository.handle, repository.gramps_id, pickle.dumps(repository.serialize())])
if not trans.batch: if not trans.batch:
self.dbapi.commit() self.dbapi.commit()
@ -1380,7 +1405,8 @@ class DBAPI(DbWriteBase, DbReadBase, UpdateCallback, Callback):
note.handle]) note.handle])
else: else:
emit = "note-add" emit = "note-add"
self.dbapi.execute("insert into note values(?, ?, ?);", self.dbapi.execute("""insert into note (handle, gramps_id, blob)
values(?, ?, ?);""",
[note.handle, note.gramps_id, pickle.dumps(note.serialize())]) [note.handle, note.gramps_id, pickle.dumps(note.serialize())])
if not trans.batch: if not trans.batch:
self.dbapi.commit() self.dbapi.commit()
@ -1403,7 +1429,8 @@ class DBAPI(DbWriteBase, DbReadBase, UpdateCallback, Callback):
place.handle]) place.handle])
else: else:
emit = "place-add" emit = "place-add"
self.dbapi.execute("insert into place values(?, ?, ?, ?);", self.dbapi.execute("""insert into place (handle, order_by, gramps_id, blob)
values(?, ?, ?, ?);""",
[place.handle, [place.handle,
self._order_by_place_key(place), self._order_by_place_key(place),
place.gramps_id, place.gramps_id,
@ -1427,7 +1454,8 @@ class DBAPI(DbWriteBase, DbReadBase, UpdateCallback, Callback):
event.handle]) event.handle])
else: else:
emit = "event-add" emit = "event-add"
self.dbapi.execute("insert into event values(?, ?, ?);", self.dbapi.execute("""insert into event (handle, gramps_id, blob)
values(?, ?, ?);""",
[event.handle, [event.handle,
event.gramps_id, event.gramps_id,
pickle.dumps(event.serialize())]) pickle.dumps(event.serialize())])
@ -1450,7 +1478,8 @@ class DBAPI(DbWriteBase, DbReadBase, UpdateCallback, Callback):
tag.handle]) tag.handle])
else: else:
emit = "tag-add" emit = "tag-add"
self.dbapi.execute("insert into tag values(?, ?, ?);", self.dbapi.execute("""insert into tag (handle, order_by, blob)
values(?, ?, ?);""",
[tag.handle, [tag.handle,
self._order_by_tag_key(tag), self._order_by_tag_key(tag),
pickle.dumps(tag.serialize())]) pickle.dumps(tag.serialize())])
@ -1475,7 +1504,8 @@ class DBAPI(DbWriteBase, DbReadBase, UpdateCallback, Callback):
media.handle]) media.handle])
else: else:
emit = "media-add" emit = "media-add"
self.dbapi.execute("insert into media values(?, ?, ?, ?);", self.dbapi.execute("""insert into media (handle, order_by, gramps_id, blob)
values(?, ?, ?, ?);""",
[media.handle, [media.handle,
self._order_by_media_key(media), self._order_by_media_key(media),
media.gramps_id, media.gramps_id,
@ -1747,18 +1777,6 @@ class DBAPI(DbWriteBase, DbReadBase, UpdateCallback, Callback):
def get_citation_bookmarks(self): def get_citation_bookmarks(self):
return self.citation_bookmarks return self.citation_bookmarks
def get_cursor(self, table, txn=None, update=False, commit=False):
## FIXME
## called from a complete find_back_ref
pass
# cursors for lookups in the reference_map for back reference
# lookups. The reference_map has three indexes:
# the main index: a tuple of (primary_handle, referenced_handle)
# the primary_handle index: the primary_handle
# the referenced_handle index: the referenced_handle
# the main index is unique, the others allow duplicate entries.
def get_default_handle(self): def get_default_handle(self):
items = self.person_map.keys() items = self.person_map.keys()
if len(items) > 0: if len(items) > 0:
@ -1988,13 +2006,17 @@ class DBAPI(DbWriteBase, DbReadBase, UpdateCallback, Callback):
order_by TEXT , order_by TEXT ,
blob TEXT blob TEXT
);""") );""")
# Reference # Secondary:
self.dbapi.execute("""CREATE TABLE IF NOT EXISTS reference ( self.dbapi.execute("""CREATE TABLE IF NOT EXISTS reference (
obj_handle TEXT, obj_handle TEXT,
obj_class TEXT, obj_class TEXT,
ref_handle TEXT, ref_handle TEXT,
ref_class TEXT ref_class TEXT
);""") );""")
self.dbapi.execute("""CREATE TABLE IF NOT EXISTS name_group (
name TEXT PRIMARY KEY NOT NULL,
grouping TEXT
);""")
## Indices: ## Indices:
self.dbapi.execute("""CREATE INDEX IF NOT EXISTS self.dbapi.execute("""CREATE INDEX IF NOT EXISTS
order_by ON person (order_by); order_by ON person (order_by);
@ -2120,7 +2142,8 @@ class DBAPI(DbWriteBase, DbReadBase, UpdateCallback, Callback):
references = set(obj.get_referenced_handles_recursively()) references = set(obj.get_referenced_handles_recursively())
# handle addition of new references # handle addition of new references
for (ref_class_name, ref_handle) in references: for (ref_class_name, ref_handle) in references:
self.dbapi.execute("INSERT into reference VALUES(?, ?, ?, ?);", self.dbapi.execute("""INSERT into reference (obj_handle, obj_class, ref_handle, ref_class)
VALUES(?, ?, ?, ?);""",
[obj.handle, [obj.handle,
obj.__class__.__name__, obj.__class__.__name__,
ref_handle, ref_handle,