SQL import/export complete. Byte for Byte exact, excluding differences in True-False/1-0, []/(), and unicode/string
svn: r12936
This commit is contained in:
parent
0a476e2a3c
commit
76d8c108b6
@ -168,8 +168,8 @@ def makeDB(db):
|
|||||||
gid CHARACTER(25),
|
gid CHARACTER(25),
|
||||||
title TEXT,
|
title TEXT,
|
||||||
main_location CHARACTER(25),
|
main_location CHARACTER(25),
|
||||||
long FLOAT,
|
long TEXT,
|
||||||
lat FLOAT,
|
lat TEXT,
|
||||||
change INTEGER,
|
change INTEGER,
|
||||||
marker0 INTEGER,
|
marker0 INTEGER,
|
||||||
marker1 TEXT,
|
marker1 TEXT,
|
||||||
@ -752,8 +752,8 @@ def export_child_ref_list(db, from_type, from_handle, to_type, ref_list):
|
|||||||
VALUES (?, ?, ?, ?, ?, ?, ?);""",
|
VALUES (?, ?, ?, ?, ?, ?, ?);""",
|
||||||
handle, ref, frel[0], frel[1],
|
handle, ref, frel[0], frel[1],
|
||||||
mrel[0], mrel[1], private)
|
mrel[0], mrel[1], private)
|
||||||
export_source_ref_list(db, from_type, handle, source_list)
|
export_source_ref_list(db, "child_ref", handle, source_list)
|
||||||
export_list(db, from_type, handle, "note", note_list)
|
export_list(db, "child_ref", handle, "note", note_list)
|
||||||
# And finally, make a link from parent to new object
|
# And finally, make a link from parent to new object
|
||||||
export_link(db, from_type, from_handle, "child_ref", handle)
|
export_link(db, from_type, from_handle, "child_ref", handle)
|
||||||
|
|
||||||
|
@ -740,15 +740,13 @@ class SQLReader(object):
|
|||||||
private) = place
|
private) = place
|
||||||
|
|
||||||
# We could look this up by "place_main", but we have the handle:
|
# We could look this up by "place_main", but we have the handle:
|
||||||
main_loc = self.get_main_location(sql, main_loc,
|
main_loc = self.get_main_location(sql, handle, with_parish=True)
|
||||||
with_parish=True)
|
|
||||||
alt_location_list = self.get_location_list(sql, "place_alt", handle,
|
alt_location_list = self.get_location_list(sql, "place_alt", handle,
|
||||||
with_parish=True)
|
with_parish=True)
|
||||||
urls = self.get_url_list(sql, "place", handle)
|
urls = self.get_url_list(sql, "place", handle)
|
||||||
media_list = self.get_media_list(sql, "place", handle)
|
media_list = self.get_media_list(sql, "place", handle)
|
||||||
source_list = self.get_source_ref_list(sql, "place", handle)
|
source_list = self.get_source_ref_list(sql, "place", handle)
|
||||||
note_list = self.get_note_list(sql, "place", handle)
|
note_list = self.get_note_list(sql, "place", handle)
|
||||||
|
|
||||||
self.db.place_map[str(handle)] = (str(handle), gid, title, long, lat,
|
self.db.place_map[str(handle)] = (str(handle), gid, title, long, lat,
|
||||||
main_loc, alt_location_list,
|
main_loc, alt_location_list,
|
||||||
urls,
|
urls,
|
||||||
|
Loading…
Reference in New Issue
Block a user