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

Fix 0001361: Web report: Directory name conflicts

Browse Source 
svn: r9366
This commit is contained in:
Brian Matherly
2007-11-18 14:19:33 +00:00
parent e7696a3a51
commit 690b0bdb3c
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -1,3 +1,7 @@
2007-11-18 Brian Matherly <brian@gramps-project.org>
* src/plugins/NarrativeWeb.py: Fix 0001361: Web report: Directory name
conflicts
2007-11-17 Martin Hawlisch <Martin.Hawlisch@gmx.de> 2007-11-17 Martin Hawlisch <Martin.Hawlisch@gmx.de>
* src/DisplayModels/_RepositoryModel.py: Properly display the city * src/DisplayModels/_RepositoryModel.py: Properly display the city

20
src/plugins/NarrativeWeb.py
View File

@@ -228,9 +228,7 @@ class BasePage:
return of return of
def link_path(self,name,path): def link_path(self,name,path):
path = "%s/%s/%s" % (path,name[0],name[1]) path = "%s/%s/%s" % (path,name[0].lower(),name[1].lower())
if os.sys.platform == "win32":
path = path.lower()
path = self.build_name(path,name) path = self.build_name(path,name)
return path return path
@@ -241,9 +239,9 @@ class BasePage:
of = codecs.EncodedFile(self.string_io,'utf-8', of = codecs.EncodedFile(self.string_io,'utf-8',
self.encoding,'xmlcharrefreplace') self.encoding,'xmlcharrefreplace')
else: else:
dirname = os.path.join(self.html_dir,path,name[0],name[1]) dirname = os.path.join(self.html_dir,
if os.sys.platform == "win32": path,name[0].lower(),
dirname = dirname.lower() name[1].lower())
if not os.path.isdir(dirname): if not os.path.isdir(dirname):
os.makedirs(dirname) os.makedirs(dirname)
page_name = self.build_name(dirname,name) page_name = self.build_name(dirname,name)
@@ -592,13 +590,11 @@ class BasePage:
def build_path(self,handle,dirroot,up=False): def build_path(self,handle,dirroot,up=False):
path = "" path = ""
if up: if up:
path = '../../../%s/%s/%s' % (dirroot,handle[0],handle[1]) path = '../../../%s/%s/%s' % (dirroot,
handle[0].lower(),
handle[1].lower())
else: else:
path = "%s/%s/%s" % (dirroot,handle[0],handle[1]) path = "%s/%s/%s" % (dirroot,handle[0].lower(),handle[1].lower())
if os.sys.platform == "win32":
path = path.lower()
return path return path
def build_name(self,path,base): def build_name(self,path,base):