From c5c5e24f7c295cd1053795e8120b5082c2ca637b Mon Sep 17 00:00:00 2001 From: Doug Blank Date: Fri, 13 Jul 2012 16:33:36 +0000 Subject: [PATCH] Fixed error in setting gramps_id when XML importing svn: r19997 --- src/webapp/dbdjango.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/webapp/dbdjango.py b/src/webapp/dbdjango.py index d9cff5d31..73051987a 100644 --- a/src/webapp/dbdjango.py +++ b/src/webapp/dbdjango.py @@ -942,7 +942,7 @@ class DbDjango(DbWriteBase, DbReadBase): def add_person(self, person, trans, set_gid=True): if not person.handle: person.handle = create_id() - if not person.gramps_id or set_gid: + if not person.gramps_id and set_gid: person.gramps_id = self.find_next_person_gramps_id() self.commit_person(person, trans) return person.handle @@ -950,7 +950,7 @@ class DbDjango(DbWriteBase, DbReadBase): def add_family(self, family, trans, set_gid=True): if not family.handle: family.handle = create_id() - if not family.gramps_id or set_gid: + if not family.gramps_id and set_gid: family.gramps_id = self.find_next_family_gramps_id() self.commit_family(family, trans) return family.handle @@ -958,7 +958,7 @@ class DbDjango(DbWriteBase, DbReadBase): def add_citation(self, citation, trans, set_gid=True): if not citation.handle: citation.handle = create_id() - if not citation.gramps_id or set_gid: + if not citation.gramps_id and set_gid: citation.gramps_id = self.find_next_citation_gramps_id() self.commit_citation(citation, trans) return citation.handle @@ -966,7 +966,7 @@ class DbDjango(DbWriteBase, DbReadBase): def add_source(self, source, trans, set_gid=True): if not source.handle: source.handle = create_id() - if not source.gramps_id or set_gid: + if not source.gramps_id and set_gid: source.gramps_id = self.find_next_source_gramps_id() self.commit_source(source, trans) return source.handle @@ -974,7 +974,7 @@ class DbDjango(DbWriteBase, DbReadBase): def add_repository(self, repository, trans, set_gid=True): if not repository.handle: repository.handle = create_id() - if not repository.gramps_id or set_gid: + if not repository.gramps_id and set_gid: repository.gramps_id = self.find_next_repository_gramps_id() self.commit_repository(repository, trans) return repository.handle @@ -982,7 +982,7 @@ class DbDjango(DbWriteBase, DbReadBase): def add_note(self, note, trans, set_gid=True): if not note.handle: note.handle = create_id() - if not note.gramps_id or set_gid: + if not note.gramps_id and set_gid: note.gramps_id = self.find_next_note_gramps_id() self.commit_note(note, trans) return note.handle @@ -990,7 +990,7 @@ class DbDjango(DbWriteBase, DbReadBase): def add_place(self, place, trans, set_gid=True): if not place.handle: place.handle = create_id() - if not place.gramps_id or set_gid: + if not place.gramps_id and set_gid: place.gramps_id = self.find_next_place_gramps_id() self.commit_place(place, trans) return place.handle @@ -998,7 +998,7 @@ class DbDjango(DbWriteBase, DbReadBase): def add_event(self, event, trans, set_gid=True): if not event.handle: event.handle = create_id() - if not event.gramps_id or set_gid: + if not event.gramps_id and set_gid: event.gramps_id = self.find_next_event_gramps_id() self.commit_event(event, trans) return event.handle @@ -1018,7 +1018,7 @@ class DbDjango(DbWriteBase, DbReadBase): """ if not obj.handle: obj.handle = create_id() - if not obj.gramps_id or set_gid: + if not obj.gramps_id and set_gid: obj.gramps_id = self.find_next_object_gramps_id() self.commit_media_object(obj, transaction) return obj.handle