From 3a98a3166e7b27ea120ea4a979b186e974c4ef12 Mon Sep 17 00:00:00 2001 From: Benny Malengier Date: Mon, 1 Oct 2007 08:49:19 +0000 Subject: [PATCH] 2007-10-01 Benny Malengier * src/GrampsDb/_DbUtils.py: do deep copy of bookmarks from old to new db * src/GrampsDb/_GrampsXMLDB.py: in load_from: load correct bookmarks svn: r9051 --- ChangeLog | 4 ++++ src/GrampsDb/_DbUtils.py | 17 +++++++++-------- src/GrampsDb/_GrampsXMLDB.py | 1 - 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 20ce8fb4d..0888efade 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2007-10-01 Benny Malengier + * src/GrampsDb/_DbUtils.py: do deep copy of bookmarks from old to new db + * src/GrampsDb/_GrampsXMLDB.py: in load_from: load correct bookmarks + 2007-09-30 Brian Matherly * src/plugins/NarrativeWeb.py: 0001238: Web report: sort references for places and media diff --git a/src/GrampsDb/_DbUtils.py b/src/GrampsDb/_DbUtils.py index 81394a46b..15177d03e 100644 --- a/src/GrampsDb/_DbUtils.py +++ b/src/GrampsDb/_DbUtils.py @@ -21,6 +21,7 @@ # $Id: __init__.py 6086 2006-03-06 03:54:58Z dallingham $ from gettext import gettext as _ +import copy import RelLib from BasicUtils import UpdateCallback @@ -272,14 +273,14 @@ def db_copy(from_db,to_db,callback): # Copy bookmarks over: # we already know that there's no overlap in handles anywhere - to_db.bookmarks = from_db.bookmarks - to_db.family_bookmarks = from_db.family_bookmarks - to_db.event_bookmarks = from_db.event_bookmarks - to_db.source_bookmarks = from_db.source_bookmarks - to_db.place_bookmarks = from_db.place_bookmarks - to_db.media_bookmarks = from_db.media_bookmarks - to_db.repo_bookmarks = from_db.repo_bookmarks - to_db.note_bookmarks = from_db.note_bookmarks + to_db.bookmarks = copy.deepcopy(from_db.bookmarks) + to_db.family_bookmarks = copy.deepcopy(from_db.family_bookmarks) + to_db.event_bookmarks = copy.deepcopy(from_db.event_bookmarks) + to_db.source_bookmarks = copy.deepcopy(from_db.source_bookmarks) + to_db.place_bookmarks = copy.deepcopy(from_db.place_bookmarks) + to_db.media_bookmarks = copy.deepcopy(from_db.media_bookmarks) + to_db.repo_bookmarks = copy.deepcopy(from_db.repo_bookmarks) + to_db.note_bookmarks = copy.deepcopy(from_db.note_bookmarks) # Copy name formats to_db.name_formats = from_db.name_formats diff --git a/src/GrampsDb/_GrampsXMLDB.py b/src/GrampsDb/_GrampsXMLDB.py index 09d249691..52f2fc881 100644 --- a/src/GrampsDb/_GrampsXMLDB.py +++ b/src/GrampsDb/_GrampsXMLDB.py @@ -74,7 +74,6 @@ class GrampsXMLDB(GrampsInMemDB): self.id_trans = {} db_copy(other_database,self,callback) GrampsInMemDB.load(self,filename,callback) - self.bookmarks.set(self.metadata.get('bookmarks',[])) self.db_is_open = True try: