5059: Reordering Gramps IDs fails

svn: r17887
This commit is contained in:
Michiel Nauta 2011-07-01 11:45:43 +00:00
parent 5cd666ca53
commit f50f7cecd7

View File

@ -180,13 +180,13 @@ class ReorderIds(tool.BatchTool):
# attempt to extract integer, if we can't, treat it as a # attempt to extract integer, if we can't, treat it as a
# duplicate # duplicate
match = _findint.match(gramps_id) try:
if match: match = _findint.match(gramps_id)
# get the integer, build the new handle. Make sure it if match:
# hasn't already been chosen. If it has, put this # get the integer, build the new handle. Make sure it
# in the duplicate handle list # hasn't already been chosen. If it has, put this
# in the duplicate handle list
try:
index = match.groups()[0] index = match.groups()[0]
if formatmatch: if formatmatch:
@ -209,9 +209,9 @@ class ReorderIds(tool.BatchTool):
obj.set_gramps_id(newgramps_id) obj.set_gramps_id(newgramps_id)
commit(obj, self.trans) commit(obj, self.trans)
newids[newgramps_id] = gramps_id newids[newgramps_id] = gramps_id
except: else:
dups.append(handle) dups.append(handle)
else: except:
dups.append(handle) dups.append(handle)
# go through the duplicates, looking for the first available # go through the duplicates, looking for the first available