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

9744: Tidy up add_* methods

Browse Source
This commit is contained in:
Nick Hall 2017-03-03 22:24:51 +00:00
parent 349bdf85b7
commit 93af3a0c63
1 changed files with 50 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

149
gramps/gen/db/generic.py
View File

@ -1761,93 +1761,61 @@ class DbGeneric(DbWriteBase, DbReadBase, UpdateCallback, Callback):
# #
################################################################ ################################################################
def add_person(self, person, trans, set_gid=True): def _add_base(self, obj, trans, set_gid, find_func, commit_func):
if not person.handle: if not obj.handle:
person.handle = create_id() obj.handle = create_id()
if (not person.gramps_id) and set_gid: if (not obj.gramps_id) and set_gid:
person.gramps_id = self.find_next_person_gramps_id() obj.gramps_id = find_func()
if not person.gramps_id: if (not obj.gramps_id):
# give it a random value for the moment: # give it a random value for the moment:
person.gramps_id = str(random.random()) obj.gramps_id = str(random.random())
self.commit_person(person, trans) commit_func(obj, trans)
return person.handle return obj.handle
def add_person(self, person, trans, set_gid=True):
return self._add_base(person, trans, set_gid,
self.find_next_person_gramps_id,
self.commit_person)
def add_family(self, family, trans, set_gid=True): def add_family(self, family, trans, set_gid=True):
if not family.handle: return self._add_base(family, trans, set_gid,
family.handle = create_id() self.find_next_family_gramps_id,
if (not family.gramps_id) and set_gid: self.commit_family)
family.gramps_id = self.find_next_family_gramps_id()
if not family.gramps_id:
# give it a random value for the moment:
family.gramps_id = str(random.random())
self.commit_family(family, trans)
return family.handle
def add_citation(self, citation, trans, set_gid=True):
if not citation.handle:
citation.handle = create_id()
if (not citation.gramps_id) and set_gid:
citation.gramps_id = self.find_next_citation_gramps_id()
if not citation.gramps_id:
# give it a random value for the moment:
citation.gramps_id = str(random.random())
self.commit_citation(citation, trans)
return citation.handle
def add_source(self, source, trans, set_gid=True):
if not source.handle:
source.handle = create_id()
if (not source.gramps_id) and set_gid:
source.gramps_id = self.find_next_source_gramps_id()
if not source.gramps_id:
# give it a random value for the moment:
source.gramps_id = str(random.random())
self.commit_source(source, trans)
return source.handle
def add_repository(self, repository, trans, set_gid=True):
if not repository.handle:
repository.handle = create_id()
if (not repository.gramps_id) and set_gid:
repository.gramps_id = self.find_next_repository_gramps_id()
if not repository.gramps_id:
# give it a random value for the moment:
repository.gramps_id = str(random.random())
self.commit_repository(repository, trans)
return repository.handle
def add_note(self, note, trans, set_gid=True):
if not note.handle:
note.handle = create_id()
if (not note.gramps_id) and set_gid:
note.gramps_id = self.find_next_note_gramps_id()
if not note.gramps_id:
# give it a random value for the moment:
note.gramps_id = str(random.random())
self.commit_note(note, trans)
return note.handle
def add_place(self, place, trans, set_gid=True):
if not place.handle:
place.handle = create_id()
if (not place.gramps_id) and set_gid:
place.gramps_id = self.find_next_place_gramps_id()
if not place.gramps_id:
# give it a random value for the moment:
place.gramps_id = str(random.random())
self.commit_place(place, trans)
return place.handle
def add_event(self, event, trans, set_gid=True): def add_event(self, event, trans, set_gid=True):
if not event.handle: return self._add_base(event, trans, set_gid,
event.handle = create_id() self.find_next_event_gramps_id,
if (not event.gramps_id) and set_gid: self.commit_event)
event.gramps_id = self.find_next_event_gramps_id()
if not event.gramps_id: def add_place(self, place, trans, set_gid=True):
# give it a random value for the moment: return self._add_base(place, trans, set_gid,
event.gramps_id = str(random.random()) self.find_next_place_gramps_id,
self.commit_event(event, trans) self.commit_place)
return event.handle
def add_repository(self, repository, trans, set_gid=True):
return self._add_base(repository, trans, set_gid,
self.find_next_repository_gramps_id,
self.commit_repository)
def add_source(self, source, trans, set_gid=True):
return self._add_base(source, trans, set_gid,
self.find_next_source_gramps_id,
self.commit_source)
def add_citation(self, citation, trans, set_gid=True):
return self._add_base(citation, trans, set_gid,
self.find_next_citation_gramps_id,
self.commit_citation)
def add_media(self, media, trans, set_gid=True):
return self._add_base(media, trans, set_gid,
self.find_next_media_gramps_id,
self.commit_media)
def add_note(self, note, trans, set_gid=True):
return self._add_base(note, trans, set_gid,
self.find_next_note_gramps_id,
self.commit_note)
def add_tag(self, tag, trans): def add_tag(self, tag, trans):
if not tag.handle: if not tag.handle:
@ -1855,23 +1823,6 @@ class DbGeneric(DbWriteBase, DbReadBase, UpdateCallback, Callback):
self.commit_tag(tag, trans) self.commit_tag(tag, trans)
return tag.handle return tag.handle
def add_media(self, obj, transaction, set_gid=True):
"""
Add a Media to the database, assigning internal IDs if they have
not already been defined.
If not set_gid, then gramps_id is not set.
"""
if not obj.handle:
obj.handle = create_id()
if (not obj.gramps_id) and set_gid:
obj.gramps_id = self.find_next_media_gramps_id()
if not obj.gramps_id:
# give it a random value for the moment:
obj.gramps_id = str(random.random())
self.commit_media(obj, transaction)
return obj.handle
################################################################ ################################################################
# #
# commit_* methods # commit_* methods