Changeset 348

Timestamp:

07/02/12 11:34:28 (11 months ago)

Author:

mbutscher

Message:

branches/stable-2.2:
* Bug fixed: "page" insertion processed value as wiki words, not wiki

links (different with subpages)

branches/mbutscher/work:
* Bug fixed: "page" insertion processed value as wiki words, not wiki

links (different with subpages)

Location:

branches

Files:

• mbutscher/work/extensions/HtmlExporter.py (modified) (3 diffs)
• stable-2.2/extensions/HtmlExporter.py (modified) (3 diffs)

branches/mbutscher/work/extensions/HtmlExporter.py

@@ -1442 +1442 @@
             self.optsStack["innermostFullPageAst"] = self.basePageAst
             self.optsStack["innermostPageUnifName"] = u"wikipage/" + word
+            self.optsStack["innermostDocPage"] = wikiPage
             self.processAst(content, self.basePageAst)
 
@@ -1693 +1694 @@
                 # Prevent infinite recursion
                 return
+
+            containingPage = self.optsStack["innermostDocPage"]
+            
+            langHelper = wx.GetApp().createWikiLanguageHelper(
+                    containingPage.getWikiLanguageName())
+                    
+            if langHelper.checkForInvalidWikiLink(value,
+                    self.mainControl.getWikiDocument()):
+                return
+
+            value = langHelper.resolveWikiWordLink(value, containingPage)
 
             docpage = self.wikiDocument.getWikiPageNoError(value)
@@ -1736 +1748 @@
                     self.optsStack["innermostPageUnifName"] = \
                             docpage.getUnifiedPageName()
+                    self.optsStack["innermostDocPage"] = docpage
 
                     self.optsStack["anchorForHeading"] = False

branches/stable-2.2/extensions/HtmlExporter.py

@@ -1222 +1222 @@
             self.optsStack["innermostFullPageAst"] = self.basePageAst
             self.optsStack["innermostPageUnifName"] = u"wikipage/" + word
+            self.optsStack["innermostDocPage"] = wikiPage
             self.processAst(content, self.basePageAst)
 
@@ -1432 +1433 @@
                 # Prevent infinite recursion
                 return
+
+            containingPage = self.optsStack["innermostDocPage"]
+            
+            langHelper = wx.GetApp().createWikiLanguageHelper(
+                    containingPage.getWikiLanguageName())
+                    
+            if langHelper.checkForInvalidWikiLink(value,
+                    self.mainControl.getWikiDocument()):
+                return
+
+            value = langHelper.resolveWikiWordLink(value, containingPage)
 
             docpage = self.wikiDocument.getWikiPageNoError(value)
@@ -1475 +1487 @@
                     self.optsStack["innermostPageUnifName"] = \
                             docpage.getUnifiedPageName()
+                    self.optsStack["innermostDocPage"] = docpage
 
                     self.optsStack["anchorForHeading"] = False