From 48394f8babfddbc892845bc03b3ca88a8fcf1340 Mon Sep 17 00:00:00 2001 From: Brian Matherly Date: Mon, 14 May 2007 03:44:34 +0000 Subject: [PATCH] * src/plugins/NarrativeWeb.py: Fix reference paths on Windows. svn: r8467 --- ChangeLog | 3 +++ src/plugins/NarrativeWeb.py | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index b536ad7cb..677bc6c08 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +2007-05-13 Brian Matherly + * src/plugins/NarrativeWeb.py: Fix reference paths on Windows. + 2007-05-11 Benny Malengier * src/GrampsDbUtils/_ReadXML.py: * src/GrampsDb/_GrampsDbWriteXML.py: diff --git a/src/plugins/NarrativeWeb.py b/src/plugins/NarrativeWeb.py index dbc7b63a1..d0e22f95e 100644 --- a/src/plugins/NarrativeWeb.py +++ b/src/plugins/NarrativeWeb.py @@ -162,7 +162,7 @@ class BasePage: def store_file(self,archive,html_dir,from_path,to_path): if archive: - archive.add(from_path,to_path) + archive.add(str(from_path),str(to_path)) else: dest = os.path.join(html_dir,to_path) dirname = os.path.dirname(dest) @@ -211,7 +211,7 @@ class BasePage: def link_path(self,name,path): base = self.build_name("",name) - path = os.path.join(path,name[0],name[1],base) + path = "%s/%s/%s/%s" % (path,name[0],name[1],base) if os.sys.platform == "win32": path = path.lower() return path