From 1add2aa37bde3b09050846660383eb4326673880 Mon Sep 17 00:00:00 2001 From: Benny Malengier Date: Fri, 12 Oct 2007 10:37:19 +0000 Subject: [PATCH] 2007-10-12 Benny Malengier * src/gen/db/dbdir.py: do name group change from GrampsBSDDB to dbdir. svn: r9159 --- ChangeLog | 3 +++ src/gen/db/dbdir.py | 14 ++++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index d4be4b0c2..b95701990 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +2007-10-12 Benny Malengier + * src/gen/db/dbdir.py: do name group change from GrampsBSDDB to dbdir. + 2007-10-11 Don Allingham * src/DisplayState.py: fix callback references * src/DbState.py: fix callback references diff --git a/src/gen/db/dbdir.py b/src/gen/db/dbdir.py index 889b2f5df..6fb66e9b0 100644 --- a/src/gen/db/dbdir.py +++ b/src/gen/db/dbdir.py @@ -839,7 +839,6 @@ class GrampsDBDir(GrampsDbBase, UpdateCallback): > result_list = [i for i in find_backlink_handles(handle)] """ - # Use the secondary index to locate all the reference_map entries # that include a reference to the object we are looking for. referenced_cur = self.get_reference_map_referenced_cursor() @@ -1345,6 +1344,9 @@ class GrampsDBDir(GrampsDbBase, UpdateCallback): self.event_map.sync() def set_name_group_mapping(self, name, group): + """Make name group under the value of group. + If group =None, the old grouping is deleted + """ try: self.__set_name_group_mapping(name, group) except DBERRS, msg: @@ -1359,11 +1361,11 @@ class GrampsDBDir(GrampsDbBase, UpdateCallback): else: the_txn = None name = str(name) - data = self.name_group.get(name,txn=the_txn) - if not group and data: - self.name_group.delete(name,txn=the_txn) - else: - self.name_group.put(name,group,txn=the_txn) + data = self.name_group.get(name, txn=the_txn) + if data is not None: + self.name_group.delete(name, txn=the_txn) + if group is not None: + self.name_group.put(name, group, txn=the_txn) if self.UseTXN: the_txn.commit() else: