FIX MAJOR ERROR blocking upgrade of old family trees !

svn: r20957
This commit is contained in:
Benny Malengier 2013-01-03 11:26:23 +00:00
parent 4bf5b00fd7
commit 6ab5a23503

View File

@ -195,7 +195,7 @@ def gramps_upgrade_16(self):
start_time = time.time() start_time = time.time()
for place_handle in self.place_map.keys(): for place_handle in self.place_map.keys():
place = self.place_map[place_handle] place = self.place_map[place_handle]
(handle, gramps_id, title, int, lat, (handle, gramps_id, title, longi, lat,
main_loc, alt_loc, urls, media_list, source_list, note_list, main_loc, alt_loc, urls, media_list, source_list, note_list,
change, private) = place change, private) = place
if source_list: if source_list:
@ -208,7 +208,7 @@ def gramps_upgrade_16(self):
self, media_list) self, media_list)
if source_list or media_list: if source_list or media_list:
new_place = (handle, gramps_id, title, new_place = (handle, gramps_id, title,
int, lat, main_loc, alt_loc, urls, longi, lat, main_loc, alt_loc, urls,
media_list, new_citation_list, note_list, media_list, new_citation_list, note_list,
change, private) change, private)
with BSDDBTxn(self.env, self.place_map) as txn: with BSDDBTxn(self.env, self.place_map) as txn:
@ -1004,12 +1004,12 @@ def gramps_upgrade_14(self):
# --------------------------------- # ---------------------------------
for place_handle in self.place_map.keys(): for place_handle in self.place_map.keys():
place = self.place_map[place_handle] place = self.place_map[place_handle]
(handle, gramps_id, title, int, lat, (handle, gramps_id, title, longi, lat,
main_loc, alt_loc, urls, media_list, source_list, note_list, main_loc, alt_loc, urls, media_list, source_list, note_list,
change, marker, private) = place change, marker, private) = place
new_media_list = new_media_list_14(media_list) new_media_list = new_media_list_14(media_list)
new_source_list = new_source_list_14(source_list) new_source_list = new_source_list_14(source_list)
new_place = (handle, gramps_id, title, int, lat, new_place = (handle, gramps_id, title, longi, lat,
main_loc, alt_loc, urls, new_media_list, main_loc, alt_loc, urls, new_media_list,
new_source_list, note_list, change, marker, private) new_source_list, note_list, change, marker, private)