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

Handle update set anywhere in struct

Browse Source
This commit is contained in:
Doug Blank 2013-12-27 01:56:33 -05:00
parent feaf10b8c9
commit 8026a9aa1f
1 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
gramps/gen/merge/diff.py
View File

@ -466,12 +466,15 @@ class Struct(object):
""" """
return self.handle_join(self.struct[item]) return self.handle_join(self.struct[item])
def get_object_from_handle(self, handle):
return self.db.get_from_name_and_handle(handle.classname, str(handle))
def handle_join(self, item): def handle_join(self, item):
""" """
If the item is a handle, look up reference object. If the item is a handle, look up reference object.
""" """
if isinstance(item, HandleClass) and self.db: if isinstance(item, HandleClass) and self.db:
obj = self.db.get_from_name_and_handle(item.classname, str(item)) obj = self.get_object_from_handle(item)
if obj: if obj:
return Struct(obj.to_struct(), self.db) return Struct(obj.to_struct(), self.db)
else: else:
@ -491,6 +494,10 @@ class Struct(object):
""" """
return self.setitem_from_path(parse(path), value, trans) return self.setitem_from_path(parse(path), value, trans)
def primary_object_q(self, _class):
return _class in ["Person", "Family", "Event", "Source", "Citation",
"Tag", "Repository", "Note", "Media"]
def setitem_from_path(self, path, value, trans=None): def setitem_from_path(self, path, value, trans=None):
""" """
Given a path to a struct part, set the last part to value. Given a path to a struct part, set the last part to value.
@ -499,7 +506,7 @@ class Struct(object):
""" """
path, item = path[:-1], path[-1] path, item = path[:-1], path[-1]
struct = self.struct struct = self.struct
# FIXME: handle assignment on join on HandleClass primary_obj = struct
for p in range(len(path)): for p in range(len(path)):
part = path[p] part = path[p]
if part.startswith("["): # getitem if part.startswith("["): # getitem
@ -508,6 +515,11 @@ class Struct(object):
struct = struct[part] struct = struct[part]
if struct is None: # invalid part to set, skip if struct is None: # invalid part to set, skip
return return
if isinstance(struct, HandleClass):
struct = self.get_object_from_handle(struct).to_struct()
# keep track of primary object for update, below
if isinstance(struct, dict) and "_class" in struct and self.primary_object_q(struct["_class"]):
primary_obj = struct
# struct is set # struct is set
if isinstance(struct, (list, tuple)): if isinstance(struct, (list, tuple)):
pos = int(item) pos = int(item)
@ -520,17 +532,15 @@ class Struct(object):
setattr(struct, item, value) setattr(struct, item, value)
else: else:
return return
self.update_db(trans) self.update_db(primary_obj, trans)
def update_db(self, trans=None): def update_db(self, struct, trans=None):
if self.db: if self.db:
if trans is None: if trans is None:
with self.transaction("Struct Update", self.db, batch=True) as trans: with self.transaction("Struct Update", self.db, batch=True) as trans:
new_obj = from_struct(self.struct) new_obj = from_struct(struct)
name, handle = self.struct["_class"], self.struct["handle"] name, handle = struct["_class"], struct["handle"]
old_obj = self.db.get_from_name_and_handle(name, handle) old_obj = self.db.get_from_name_and_handle(name, handle)
# FIXME: this needs to find the closest primary _class before each diff
# and commit that, not the topmost _class
if old_obj: if old_obj:
commit_func = self.db._tables[name]["commit_func"] commit_func = self.db._tables[name]["commit_func"]
commit_func(new_obj, trans) commit_func(new_obj, trans)
@ -538,8 +548,8 @@ class Struct(object):
add_func = self.db._tables[name]["add_func"] add_func = self.db._tables[name]["add_func"]
add_func(new_obj, trans) add_func(new_obj, trans)
else: else:
new_obj = from_struct(self.struct) new_obj = from_struct(struct)
name, handle = self.struct["_class"], self.struct["handle"] name, handle = struct["_class"], struct["handle"]
old_obj = self.db.get_from_name_and_handle(name, handle) old_obj = self.db.get_from_name_and_handle(name, handle)
if old_obj: if old_obj:
commit_func = self.db._tables[name]["commit_func"] commit_func = self.db._tables[name]["commit_func"]