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

(GrampsBSDDB._delete_primary_from_reference_map): Accept txn

Browse Source 
argument; pass it on to self._remove_reference().
	* src/GrampsDb/_GrampsBSDDB.py (GrampsBSDDB._do_remove_object):
	Work out both regular and batch transactions.


svn: r6296
This commit is contained in:
Alex Roitman 2006-04-10 01:45:36 +00:00
parent dc434a5736
commit 9b3b2fe2e5
2 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,4 +1,9 @@
2006-04-09 Alex Roitman <shura@gramps-project.org> 2006-04-09 Alex Roitman <shura@gramps-project.org>
(GrampsBSDDB._delete_primary_from_reference_map): Accept txn
argument; pass it on to self._remove_reference().
* src/GrampsDb/_GrampsBSDDB.py (GrampsBSDDB._do_remove_object):
Work out both regular and batch transactions.
* src/Makefile.am: Clean byte-compiled files. * src/Makefile.am: Clean byte-compiled files.
* src/DataViews/Makefile.am: Clean byte-compiled files. * src/DataViews/Makefile.am: Clean byte-compiled files.
* src/GrampsDb/Makefile.am: Clean byte-compiled files. * src/GrampsDb/Makefile.am: Clean byte-compiled files.

30
src/GrampsDb/_GrampsBSDDB.py
View File

@ -587,7 +587,7 @@ class GrampsBSDDB(GrampsDbBase):
return return
def _delete_primary_from_reference_map(self, handle, transaction): def _delete_primary_from_reference_map(self,handle,transaction,txn=None):
"""Remove all references to the primary object from the reference_map""" """Remove all references to the primary object from the reference_map"""
primary_cur = self.get_reference_map_primary_cursor() primary_cur = self.get_reference_map_primary_cursor()
@ -609,7 +609,7 @@ class GrampsBSDDB(GrampsDbBase):
main_key = (handle, cPickle.loads(data)[1][1]) main_key = (handle, cPickle.loads(data)[1][1])
self._remove_reference(main_key,transaction) self._remove_reference(main_key,transaction,txn)
ret = primary_cur.next_dup() ret = primary_cur.next_dup()
@ -855,13 +855,27 @@ class GrampsBSDDB(GrampsDbBase):
self.metadata = None self.metadata = None
self.db_is_open = False self.db_is_open = False
def _do_remove_object(self,handle,trans,dmap,key,del_list): def _do_remove_object(self,handle,transaction,data_map,key,del_list):
self._delete_primary_from_reference_map(handle,trans) if self.readonly or not handle:
if not self.readonly: return
handle = str(handle) handle = str(handle)
if not trans.batch: if transaction.batch:
old_data = dmap.get(handle,txn=self.txn) if self.UseTXN:
trans.add(key,handle,old_data,None) the_txn = self.env.txn_begin()
else:
the_txn = None
self._delete_primary_from_reference_map(handle,transaction,
txn=the_txn)
data_map.delete(handle,txn=the_txn)
if not self.UseTXN:
data_map.sync()
if the_txn:
the_txn.commit()
else:
self._delete_primary_from_reference_map(handle,transaction)
old_data = data_map.get(handle,txn=self.txn)
transaction.add(key,handle,old_data,None)
del_list.append(handle) del_list.append(handle)
def _del_person(self,handle): def _del_person(self,handle):