* src/GrampsDb/_GrampsBSDDB.py (rebuild_secondary): Proper rebuild.
svn: r5788
This commit is contained in:
parent
6f89860046
commit
f8ee1159db
@ -6,6 +6,7 @@
|
|||||||
* src/GrampsDb/_GrampsBSDDB.py (load): Use BTREE for
|
* src/GrampsDb/_GrampsBSDDB.py (load): Use BTREE for
|
||||||
reference_map; sort reference_map_referenced_map index.
|
reference_map; sort reference_map_referenced_map index.
|
||||||
* src/GrampsDb/_ReadGedcom.py (parse_record): Restore add def_src.
|
* src/GrampsDb/_ReadGedcom.py (parse_record): Restore add def_src.
|
||||||
|
* src/GrampsDb/_GrampsBSDDB.py (rebuild_secondary): Proper rebuild.
|
||||||
|
|
||||||
2006-01-17 Don Allingham <don@gramps-project.org>
|
2006-01-17 Don Allingham <don@gramps-project.org>
|
||||||
* src/DbPrompter.py: removed
|
* src/DbPrompter.py: removed
|
||||||
|
@ -415,111 +415,112 @@ class GrampsBSDDB(GrampsDbBase):
|
|||||||
table_flags = db.DB_CREATE|db.DB_AUTO_COMMIT
|
table_flags = db.DB_CREATE|db.DB_AUTO_COMMIT
|
||||||
|
|
||||||
# Repair secondary indices related to person_map
|
# Repair secondary indices related to person_map
|
||||||
|
|
||||||
self.id_trans.close()
|
self.id_trans.close()
|
||||||
self.surnames.close()
|
junk = db.DB(self.env)
|
||||||
|
junk.remove(self.full_name,"idtrans")
|
||||||
self.id_trans = db.DB(self.env)
|
self.id_trans = db.DB(self.env)
|
||||||
self.id_trans.set_flags(db.DB_DUP)
|
self.id_trans.set_flags(db.DB_DUP)
|
||||||
self.id_trans.open(self.full_name, "idtrans", db.DB_HASH,
|
self.id_trans.open(self.full_name, "idtrans", db.DB_HASH,
|
||||||
flags=table_flags)
|
flags=table_flags)
|
||||||
self.id_trans.truncate()
|
self.person_map.associate(self.id_trans,find_idmap,table_flags)
|
||||||
|
|
||||||
|
self.surnames.close()
|
||||||
|
junk = db.DB(self.env)
|
||||||
|
junk.remove(self.full_name,"surnames")
|
||||||
self.surnames = db.DB(self.env)
|
self.surnames = db.DB(self.env)
|
||||||
self.surnames.set_flags(db.DB_DUP)
|
self.surnames.set_flags(db.DB_DUP)
|
||||||
self.surnames.open(self.full_name, "surnames", db.DB_HASH,
|
self.surnames.open(self.full_name, "surnames", db.DB_HASH,
|
||||||
flags=table_flags)
|
flags=table_flags)
|
||||||
self.surnames.truncate()
|
self.person_map.associate(self.surnames, find_surname, table_flags)
|
||||||
|
|
||||||
self.person_map.associate(self.surnames, find_surname, db.DB_CREATE)
|
|
||||||
self.person_map.associate(self.id_trans, find_idmap, db.DB_CREATE)
|
|
||||||
|
|
||||||
for key in self.person_map.keys():
|
|
||||||
if callback:
|
|
||||||
callback()
|
|
||||||
data = self.person_map.get(key,txn=self.txn)
|
|
||||||
self.person_map.put(key,data,txn=self.txn)
|
|
||||||
self.person_map.sync()
|
|
||||||
|
|
||||||
# Repair secondary indices related to family_map
|
# Repair secondary indices related to family_map
|
||||||
|
|
||||||
self.fid_trans.close()
|
self.fid_trans.close()
|
||||||
|
junk = db.DB(self.env)
|
||||||
|
junk.remove(self.full_name,"fidtrans")
|
||||||
self.fid_trans = db.DB(self.env)
|
self.fid_trans = db.DB(self.env)
|
||||||
self.fid_trans.set_flags(db.DB_DUP)
|
self.fid_trans.set_flags(db.DB_DUP)
|
||||||
self.fid_trans.open(self.full_name, "fidtrans", db.DB_HASH,
|
self.fid_trans.open(self.full_name, "fidtrans", db.DB_HASH,
|
||||||
flags=table_flags)
|
flags=table_flags)
|
||||||
self.fid_trans.truncate()
|
self.family_map.associate(self.fid_trans, find_idmap, table_flags)
|
||||||
self.family_map.associate(self.fid_trans, find_idmap, db.DB_CREATE)
|
|
||||||
|
|
||||||
for key in self.family_map.keys():
|
|
||||||
if callback:
|
|
||||||
callback()
|
|
||||||
self.family_map[key] = self.family_map[key]
|
|
||||||
self.family_map.sync()
|
|
||||||
|
|
||||||
# Repair secondary indices related to place_map
|
# Repair secondary indices related to place_map
|
||||||
|
|
||||||
self.pid_trans.close()
|
self.pid_trans.close()
|
||||||
|
junk = db.DB(self.env)
|
||||||
|
junk.remove(self.full_name,"pidtrans")
|
||||||
self.pid_trans = db.DB(self.env)
|
self.pid_trans = db.DB(self.env)
|
||||||
self.pid_trans.set_flags(db.DB_DUP)
|
self.pid_trans.set_flags(db.DB_DUP)
|
||||||
self.pid_trans.open(self.full_name, "pidtrans", db.DB_HASH,
|
self.pid_trans.open(self.full_name, "pidtrans", db.DB_HASH,
|
||||||
flags=table_flags)
|
flags=table_flags)
|
||||||
self.pid_trans.truncate()
|
self.place_map.associate(self.pid_trans, find_idmap, table_flags)
|
||||||
self.place_map.associate(self.pid_trans, find_idmap, db.DB_CREATE)
|
|
||||||
|
|
||||||
for key in self.place_map.keys():
|
|
||||||
if callback:
|
|
||||||
callback()
|
|
||||||
self.place_map[key] = self.place_map[key]
|
|
||||||
self.place_map.sync()
|
|
||||||
|
|
||||||
# Repair secondary indices related to media_map
|
# Repair secondary indices related to media_map
|
||||||
|
|
||||||
self.oid_trans.close()
|
self.oid_trans.close()
|
||||||
|
junk = db.DB(self.env)
|
||||||
|
junk.remove(self.full_name,"oidtrans")
|
||||||
self.oid_trans = db.DB(self.env)
|
self.oid_trans = db.DB(self.env)
|
||||||
self.oid_trans.set_flags(db.DB_DUP)
|
self.oid_trans.set_flags(db.DB_DUP)
|
||||||
self.oid_trans.open(self.full_name, "oidtrans", db.DB_HASH,
|
self.oid_trans.open(self.full_name, "oidtrans", db.DB_HASH,
|
||||||
flags=table_flags)
|
flags=table_flags)
|
||||||
self.oid_trans.truncate()
|
self.media_map.associate(self.oid_trans, find_idmap, table_flags)
|
||||||
self.media_map.associate(self.oid_trans, find_idmap, db.DB_CREATE)
|
|
||||||
|
|
||||||
for key in self.media_map.keys():
|
|
||||||
if callback:
|
|
||||||
callback()
|
|
||||||
self.media_map[key] = self.media_map[key]
|
|
||||||
self.media_map.sync()
|
|
||||||
|
|
||||||
# Repair secondary indices related to source_map
|
# Repair secondary indices related to source_map
|
||||||
|
|
||||||
self.sid_trans.close()
|
self.sid_trans.close()
|
||||||
|
junk = db.DB(self.env)
|
||||||
|
junk.remove(self.full_name,"sidtrans")
|
||||||
self.sid_trans = db.DB(self.env)
|
self.sid_trans = db.DB(self.env)
|
||||||
self.sid_trans.set_flags(db.DB_DUP)
|
self.sid_trans.set_flags(db.DB_DUP)
|
||||||
self.sid_trans.open(self.full_name, "sidtrans", db.DB_HASH,
|
self.sid_trans.open(self.full_name, "sidtrans", db.DB_HASH,
|
||||||
flags=table_flags)
|
flags=table_flags)
|
||||||
self.sid_trans.truncate()
|
self.source_map.associate(self.sid_trans, find_idmap, table_flags)
|
||||||
self.source_map.associate(self.sid_trans, find_idmap, db.DB_CREATE)
|
|
||||||
|
|
||||||
for key in self.source_map.keys():
|
# Repair secondary indices related to event_map
|
||||||
if callback:
|
self.eid_trans.close()
|
||||||
callback()
|
junk = db.DB(self.env)
|
||||||
self.source_map[key] = self.source_map[key]
|
junk.remove(self.full_name,"eidtrans")
|
||||||
self.source_map.sync()
|
self.eid_trans = db.DB(self.env)
|
||||||
|
self.eid_trans.set_flags(db.DB_DUP)
|
||||||
|
self.eid_trans.open(self.full_name, "eidtrans", db.DB_HASH,
|
||||||
|
flags=table_flags)
|
||||||
|
self.event_map.associate(self.eid_trans, find_idmap, table_flags)
|
||||||
|
|
||||||
# Repair secondary indices related to repository_map
|
# Repair secondary indices related to repository_map
|
||||||
|
|
||||||
self.rid_trans.close()
|
self.rid_trans.close()
|
||||||
|
junk = db.DB(self.env)
|
||||||
|
junk.remove(self.full_name,"ridtrans")
|
||||||
self.rid_trans = db.DB(self.env)
|
self.rid_trans = db.DB(self.env)
|
||||||
self.rid_trans.set_flags(db.DB_DUP)
|
self.rid_trans.set_flags(db.DB_DUP)
|
||||||
self.rid_trans.open(self.full_name, "ridtrans", db.DB_HASH,
|
self.rid_trans.open(self.full_name, "ridtrans", db.DB_HASH,
|
||||||
flags=table_flags)
|
flags=table_flags)
|
||||||
self.rid_trans.truncate()
|
self.repository_map.associate(self.rid_trans, find_idmap, table_flags)
|
||||||
self.repository_map.associate(self.rid_trans, find_idmap, db.DB_CREATE)
|
|
||||||
|
|
||||||
for key in self.repository_map.keys():
|
|
||||||
if callback:
|
# Repair secondary indices related to reference_map
|
||||||
callback()
|
self.reference_map_primary_map.close()
|
||||||
self.repository_map[key] = self.repository_map[key]
|
junk = db.DB(self.env)
|
||||||
self.repository_map.sync()
|
junk.remove(self.full_name,"reference_map_primary_map")
|
||||||
|
self.reference_map_primary_map = db.DB(self.env)
|
||||||
|
self.reference_map_primary_map.set_flags(db.DB_DUP)
|
||||||
|
self.reference_map_primary_map.open(self.full_name,
|
||||||
|
"reference_map_primary_map",
|
||||||
|
db.DB_BTREE,
|
||||||
|
flags=table_flags)
|
||||||
|
self.reference_map.associate(self.reference_map_primary_map,
|
||||||
|
find_primary_handle,
|
||||||
|
table_flags)
|
||||||
|
|
||||||
|
self.reference_map_referenced_map.close()
|
||||||
|
junk = db.DB(self.env)
|
||||||
|
junk.remove(self.full_name,"reference_map_referenced_map")
|
||||||
|
self.reference_map_referenced_map = db.DB(self.env)
|
||||||
|
self.reference_map_referenced_map.set_flags(db.DB_DUP|db.DB_DUPSORT)
|
||||||
|
self.reference_map_referenced_map.open(self.full_name,
|
||||||
|
"reference_map_referenced_map",
|
||||||
|
db.DB_BTREE,
|
||||||
|
flags=table_flags)
|
||||||
|
self.reference_map.associate(self.reference_map_referenced_map,
|
||||||
|
find_referenced_handle,
|
||||||
|
table_flags)
|
||||||
|
|
||||||
def find_backlink_handles(self, handle, include_classes=None):
|
def find_backlink_handles(self, handle, include_classes=None):
|
||||||
"""
|
"""
|
||||||
|
Loading…
Reference in New Issue
Block a user