2006-10-10 Alex Roitman <shura@gramps-project.org>

* src/GrampsDb/_GrampsBSDDB.py (gramps_upgrade_10,
	gramps_upgrade_11): Properly use TXN.	



svn: r7388
This commit is contained in:
Alex Roitman 2006-10-11 03:20:56 +00:00
parent 031c1d9044
commit 960e10d5f7
2 changed files with 65 additions and 8 deletions

View File

@ -1,3 +1,7 @@
2006-10-10 Alex Roitman <shura@gramps-project.org>
* src/GrampsDb/_GrampsBSDDB.py (gramps_upgrade_10,
gramps_upgrade_11): Properly use TXN.
2006-10-09 Alex Roitman <shura@gramps-project.org> 2006-10-09 Alex Roitman <shura@gramps-project.org>
* src/GrampsDb/_GrampsDbBase.py (has_object_handle): Typo. * src/GrampsDb/_GrampsDbBase.py (has_object_handle): Typo.

View File

@ -1945,9 +1945,18 @@ class GrampsBSDDB(GrampsDbBase,UpdateCallback):
description, place, source_list, note, media_list, description, place, source_list, note, media_list,
attr_list, change, marker, private) attr_list, change, marker, private)
self.event_map.put(str(handle),info) if self.UseTXN:
the_txn = self.env.txn_begin()
else:
the_txn = None
self.event_map.put(str(handle),info,txn=the_txn)
if self.UseTXN:
the_txn.commit()
self.update() self.update()
if not self.UseTXN:
self.event_map.sync()
# Personal event references # Personal event references
for handle in self.person_map.keys(): for handle in self.person_map.keys():
info = self.person_map[handle] info = self.person_map[handle]
@ -1976,10 +1985,18 @@ class GrampsBSDDB(GrampsDbBase,UpdateCallback):
attribute_list,urls,lds_ord_list,source_list,note, attribute_list,urls,lds_ord_list,source_list,note,
change,marker,private,person_ref_list,) change,marker,private,person_ref_list,)
# self.commit_person(person,trans) if self.UseTXN:
self.person_map.put(str(handle),info) the_txn = self.env.txn_begin()
else:
the_txn = None
self.person_map.put(str(handle),info,txn=the_txn)
if self.UseTXN:
the_txn.commit()
self.update() self.update()
if not self.UseTXN:
self.person_map.sync()
# Family event references # Family event references
for handle in self.family_map.keys(): for handle in self.family_map.keys():
info = self.family_map[handle] info = self.family_map[handle]
@ -1999,8 +2016,17 @@ class GrampsBSDDB(GrampsDbBase,UpdateCallback):
media_list,attribute_list,lds_seal_list, media_list,attribute_list,lds_seal_list,
source_list,note,change, marker, private) source_list,note,change, marker, private)
self.family_map.put(str(handle),info) if self.UseTXN:
the_txn = self.env.txn_begin()
else:
the_txn = None
self.family_map.put(str(handle),info,txn=the_txn)
if self.UseTXN:
the_txn.commit()
self.update() self.update()
if not self.UseTXN:
self.family_map.sync()
self.reset() self.reset()
if self.UseTXN: if self.UseTXN:
@ -2046,9 +2072,18 @@ class GrampsBSDDB(GrampsDbBase,UpdateCallback):
urls,lds_ord_list,source_list,note,change,marker, urls,lds_ord_list,source_list,note,change,marker,
private,person_ref_list,) private,person_ref_list,)
self.person_map.put(str(handle),info) if self.UseTXN:
the_txn = self.env.txn_begin()
else:
the_txn = None
self.person_map.put(str(handle),info,txn=the_txn)
if self.UseTXN:
the_txn.commit()
self.update() self.update()
if not self.UseTXN:
self.person_map.sync()
# Repositories # Repositories
for handle in self.repository_map.keys(): for handle in self.repository_map.keys():
info = self.repository_map[handle] info = self.repository_map[handle]
@ -2062,9 +2097,18 @@ class GrampsBSDDB(GrampsDbBase,UpdateCallback):
info = (handle, gramps_id, the_type, name, note, info = (handle, gramps_id, the_type, name, note,
new_address_list, urls, marker, private) new_address_list, urls, marker, private)
self.repository_map.put(str(handle),info) if self.UseTXN:
the_txn = self.env.txn_begin()
else:
the_txn = None
self.repository_map.put(str(handle),info,txn=the_txn)
if self.UseTXN:
the_txn.commit()
self.update() self.update()
if not self.UseTXN:
self.repository_map.sync()
# Places # Places
for handle in self.place_map.keys(): for handle in self.place_map.keys():
info = self.place_map[handle] info = self.place_map[handle]
@ -2080,9 +2124,18 @@ class GrampsBSDDB(GrampsDbBase,UpdateCallback):
info = (handle,gramps_id,title,long,lat,main_loc,new_alt_loc,urls, info = (handle,gramps_id,title,long,lat,main_loc,new_alt_loc,urls,
media_list, source_list, note, change, marker, private) media_list, source_list, note, change, marker, private)
self.place_map.put(str(handle),info) if self.UseTXN:
the_txn = self.env.txn_begin()
else:
the_txn = None
self.place_map.put(str(handle),info,txn=the_txn)
if self.UseTXN:
the_txn.commit()
self.update() self.update()
if not self.UseTXN:
self.place_map.sync()
self.reset() self.reset()
if self.UseTXN: if self.UseTXN: