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

DictionaryDb: implement delete

Browse Source
This commit is contained in:
Doug Blank 2015-05-13 22:55:23 -04:00
parent e7dc1a7bc4
commit 73886e9232
1 changed files with 9 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
gramps/plugins/database/dictionarydb.py
View File

@ -999,6 +999,11 @@ class DictionaryDb(DbWriteBase, DbReadBase, UpdateCallback, Callback):
return self.tag_map[handle].serialize() return self.tag_map[handle].serialize()
return None return None
def get_raw_event_data(self, handle):
if handle in self.event_map:
return self.event_map[handle].serialize()
return None
def add_person(self, person, trans, set_gid=True): def add_person(self, person, trans, set_gid=True):
if not person.handle: if not person.handle:
person.handle = create_id() person.handle = create_id()
@ -1244,22 +1249,9 @@ class DictionaryDb(DbWriteBase, DbReadBase, UpdateCallback, Callback):
if self.readonly or not handle: if self.readonly or not handle:
return return
person = self.get_person_from_handle(handle) if handle in self.person_map:
#self.genderStats.uncount_person (person) del self.person_map[handle]
#self.remove_from_surname_list(person)
if isinstance(handle, str):
handle = handle.encode('utf-8')
if transaction.batch:
with BSDDBTxn(self.env, self.person_map) as txn:
self.delete_primary_from_reference_map(handle, transaction,
txn=txn.txn)
txn.delete(handle)
else:
self.delete_primary_from_reference_map(handle, transaction,
txn=self.txn)
self.person_map.delete(handle, txn=self.txn)
self.emit("person-delete", ([handle],)) self.emit("person-delete", ([handle],))
transaction.add(PERSON_KEY, TXNDEL, handle, person.serialize(), None)
def remove_source(self, handle, transaction): def remove_source(self, handle, transaction):
""" """
@ -1345,21 +1337,11 @@ class DictionaryDb(DbWriteBase, DbReadBase, UpdateCallback, Callback):
def __do_remove(self, handle, transaction, data_map, key): def __do_remove(self, handle, transaction, data_map, key):
if self.readonly or not handle: if self.readonly or not handle:
return return
if isinstance(handle, str): if isinstance(handle, str):
handle = handle.encode('utf-8') handle = handle.encode('utf-8')
if transaction.batch: if handle in data_map:
with BSDDBTxn(self.env, data_map) as txn: del data_map[handle]
self.delete_primary_from_reference_map(handle, transaction,
txn=txn.txn)
txn.delete(handle)
else:
self.delete_primary_from_reference_map(handle, transaction,
txn=self.txn)
old_data = data_map.get(handle, txn=self.txn)
data_map.delete(handle, txn=self.txn)
self.emit(KEY_TO_NAME_MAP[key] + "-delete", ([handle],)) self.emit(KEY_TO_NAME_MAP[key] + "-delete", ([handle],))
transaction.add(key, TXNDEL, handle, old_data, None)
def delete_primary_from_reference_map(self, handle, transaction, txn=None): def delete_primary_from_reference_map(self, handle, transaction, txn=None):
""" """