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

update

Browse Source 
svn: r7315
This commit is contained in:
Don Allingham 2006-09-12 04:09:53 +00:00
parent 2d8868063d
commit 4d6b599df9
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/GrampsDb/_ReadXML.py
View File

@ -170,13 +170,13 @@ def importData(database, filename, callback=None,cl=0,use_trans=False):
# copy all local images into <database>.images directory # copy all local images into <database>.images directory
db_dir = os.path.abspath(os.path.dirname(database.get_save_path())) db_dir = os.path.abspath(os.path.dirname(database.get_save_path()))
db_base = os.path.basename(database.get_save_path()) db_base = os.path.basename(database.get_save_path())
img_dir = "%s%s%s.images" % (db_dir,os.path.sep,db_base) img_dir = os.path.join(db_dir,db_base)
first = not os.path.exists(img_dir) first = not os.path.exists(img_dir)
for m_id in database.get_media_object_handles(): for m_id in database.get_media_object_handles():
mobject = database.get_object_from_handle(m_id) mobject = database.get_object_from_handle(m_id)
oldfile = mobject.get_path() oldfile = mobject.get_path()
if oldfile and os.path.isabs(oldfile): if oldfile and not os.path.isabs(oldfile):
if first: if first:
os.mkdir(img_dir) os.mkdir(img_dir)
first = 0 first = 0
@ -1000,9 +1000,9 @@ class GrampsParser(UpdateCallback):
def start_file(self,attrs): def start_file(self,attrs):
self.object.mime = attrs['mime'] self.object.mime = attrs['mime']
self.object.desc = attrs['description'] self.object.desc = attrs['description']
src = attrs["src"] drive,src = os.path.splitdrive(attrs["src"])
if src: if src:
if os.path.isabs(src): if not drive and not os.path.isabs(src):
fullpath = os.path.abspath(self.filename) fullpath = os.path.abspath(self.filename)
src = os.path.join(os.path.dirname(fullpath),src) src = os.path.join(os.path.dirname(fullpath),src)
self.object.path = src self.object.path = src
@ -1179,10 +1179,11 @@ class GrampsParser(UpdateCallback):
# the old format of <object src="blah"...> # the old format of <object src="blah"...>
self.object.mime = attrs.get('mime','') self.object.mime = attrs.get('mime','')
self.object.desc = attrs.get('description','') self.object.desc = attrs.get('description','')
src = attrs.get("src",'') src = attrs.get("src",'')
if src and os.path.isabs(src): if src:
fullpath = os.path.abspath(self.filename) if not os.path.isabs(src):
src = os.path.join(os.path.dirname(fullpath),src) fullpath = os.path.abspath(self.filename)
src = os.path.join(os.path.dirname(fullpath),src)
self.object.path = src self.object.path = src
def start_repo(self,attrs): def start_repo(self,attrs):
@ -1225,8 +1226,8 @@ class GrampsParser(UpdateCallback):
elif key == "priv": elif key == "priv":
self.pref.set_privacy(int(attrs[key])) self.pref.set_privacy(int(attrs[key]))
elif key == "src": elif key == "src":
src = attrs["src"] src = attrs["src"]
if os.path.isabs(src): if not os.path.isabs(src):
self.photo.set_path(os.path.join(self.base,src)) self.photo.set_path(os.path.join(self.base,src))
else: else:
self.photo.set_path(src) self.photo.set_path(src)