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

ReorderIds tool crashes with 'bytes' error on bsddb (#428)

Browse Source 
fixes #10098
This commit is contained in:
Paul Culley 2017-06-26 16:17:40 -05:00 committed by Nick Hall
parent e6ec825a97
commit dc645c813b
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gramps/plugins/tool/reorderids.py
View File

@ -230,7 +230,7 @@ class ReorderIds(tool.BatchTool, ManagedWindow, UpdateCallback):
self.prim_methods, self.obj_methods = {}, {} self.prim_methods, self.obj_methods = {}, {}
for prim_obj, prim_objs in self.xobjects: for prim_obj, prim_objs in self.xobjects:
class_type = prim_obj.title() class_type = prim_obj.title()
table = "self.dbstate.%s_map" % prim_obj iter_handles = "self.dbstate.iter_%s_handles" % prim_obj
get_number_obj = "self.dbstate.get_number_of_%s" % prim_objs get_number_obj = "self.dbstate.get_number_of_%s" % prim_objs
prefix_fmt = "self.dbstate.%s_prefix" % prim_obj prefix_fmt = "self.dbstate.%s_prefix" % prim_obj
get_from_id = "self.dbstate.get_%s_from_gramps_id" % prim_obj get_from_id = "self.dbstate.get_%s_from_gramps_id" % prim_obj
@ -240,7 +240,7 @@ class ReorderIds(tool.BatchTool, ManagedWindow, UpdateCallback):
self.prim_methods[prim_obj] = (eval(prefix_fmt), eval(get_number_obj)(), self.prim_methods[prim_obj] = (eval(prefix_fmt), eval(get_number_obj)(),
eval(next_from_id)()) eval(next_from_id)())
self.obj_methods[prim_obj] = (eval(class_type), eval(table), eval(commit), self.obj_methods[prim_obj] = (eval(class_type), eval(iter_handles), eval(commit),
eval(get_from_id), eval(get_from_handle), eval(get_from_id), eval(get_from_handle),
eval(next_from_id)) eval(next_from_id))
@ -549,7 +549,7 @@ class ReorderIds(tool.BatchTool, ManagedWindow, UpdateCallback):
dup_ids = [] # list of duplicate identifiers dup_ids = [] # list of duplicate identifiers
new_ids = {} # list of new identifiers new_ids = {} # list of new identifiers
class_type, table, commit, get_from_id, get_from_handle, next_from_id = \ class_type, iter_handles, commit, get_from_id, get_from_handle, next_from_id = \
self.obj_methods[prim_obj] self.obj_methods[prim_obj]
prefix_fmt = self.obj_values[prim_obj].get_fmt() prefix_fmt = self.obj_values[prim_obj].get_fmt()
@ -561,7 +561,7 @@ class ReorderIds(tool.BatchTool, ManagedWindow, UpdateCallback):
formatmatch = _parseformat.match(prefix_fmt) formatmatch = _parseformat.match(prefix_fmt)
index_max = int("9" * int(formatmatch.groups()[0])) index_max = int("9" * int(formatmatch.groups()[0]))
for handle in list(table.keys()): for handle in iter_handles():
# Update progress # Update progress
if self.uistate: if self.uistate:
self.progress.step() self.progress.step()
@ -569,9 +569,7 @@ class ReorderIds(tool.BatchTool, ManagedWindow, UpdateCallback):
self.update() self.update()
# extract basic data out of the database # extract basic data out of the database
table_data = table[handle] obj = get_from_handle(handle)
obj = class_type()
obj.unserialize(table_data)
act_id = obj.get_gramps_id() act_id = obj.get_gramps_id()
if change: if change: