From 52a01bdd139271fa842a7a9c34b91368b3f177e1 Mon Sep 17 00:00:00 2001 From: Brian Matherly Date: Mon, 11 Dec 2006 05:31:51 +0000 Subject: [PATCH] * src/plugins/NarrativeWeb.py: fix 0000597: Narrative web site generates uppercase directory names but lower case hrefs svn: r7778 --- gramps2/ChangeLog | 4 ++++ gramps2/src/plugins/NarrativeWeb.py | 17 ++++++++++++++--- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog index 45f4d8c7a..c37c7e8bd 100644 --- a/gramps2/ChangeLog +++ b/gramps2/ChangeLog @@ -1,3 +1,7 @@ +2006-12-10 Brian Matherly + * src/plugins/NarrativeWeb.py: fix 0000597: Narrative web site + generates uppercase directory names but lower case hrefs + 2006-12-10 Don Allingham * src/DataViews/_RelationView.py: RunDatabaseRepair integration * src/GrampsDb/_WriteGedcom.py: RunDatabaseRepair integration diff --git a/gramps2/src/plugins/NarrativeWeb.py b/gramps2/src/plugins/NarrativeWeb.py index 32d481213..41aed38c6 100644 --- a/gramps2/src/plugins/NarrativeWeb.py +++ b/gramps2/src/plugins/NarrativeWeb.py @@ -200,7 +200,10 @@ class BasePage: def link_path(self,name,path): base = self.build_name("",name) - return os.path.join(path,name[0],name[1],base) + path = os.path.join(path,name[0],name[1],base) + if os.sys.platform == "win32": + path = path.lower() + return path def create_link_file(self,name,path): self.cur_name = self.link_path(name,path) @@ -210,6 +213,8 @@ class BasePage: self.encoding,'xmlcharrefreplace') else: dirname = os.path.join(self.html_dir,path,name[0],name[1]) + if os.sys.platform == "win32": + dirname = dirname.lower() if not os.path.isdir(dirname): os.makedirs(dirname) page_name = self.build_name(dirname,name) @@ -480,10 +485,16 @@ class BasePage: of.write('\n') def build_path(self,handle,dirroot,up=False): + path = "" if up: - return '../../../%s/%s/%s' % (dirroot,handle[0],handle[1]) + path = '../../../%s/%s/%s' % (dirroot,handle[0],handle[1]) else: - return "%s/%s/%s" % (dirroot,handle[0],handle[1]) + path = "%s/%s/%s" % (dirroot,handle[0],handle[1]) + + if os.sys.platform == "win32": + path = path.lower() + + return path def build_name(self,path,base): if path: