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

2007-10-01 Benny Malengier <benny.malengier@gramps-project.org>

Browse Source 
* 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
This commit is contained in:
Benny Malengier 2007-10-01 08:49:19 +00:00
parent 7a653663dc
commit 3a98a3166e
3 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2007-10-01 Benny Malengier <benny.malengier@gramps-project.org>
* 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 <brian@gramps-project.org>
* src/plugins/NarrativeWeb.py: 0001238: Web report: sort references for
places and media

17
src/GrampsDb/_DbUtils.py
View File

@ -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

1
src/GrampsDb/_GrampsXMLDB.py
View File

@ -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: