Changeset 245

Timestamp:

01/12/11 13:56:54 (2 years ago)

Author:

mbutscher

Message:

* Bug fixed: Autocompletion for anchors treated wiki

links as wiki words (no relative or absolute paths
supported)

* Bug fixed: Indexing of updated pages was called

directly in event handling instead of in the
update thread

Location:

branches/mbutscher/work

Files:

• extensions/wikidPadParser/WikidPadParser.py (modified) (6 diffs)
• lib/pwiki/DocPages.py (modified) (4 diffs)
• lib/pwiki/wikidata/WikiDataManager.py (modified) (2 diffs)

branches/mbutscher/work/extensions/wikidPadParser/WikidPadParser.py

@@ -3 +3 @@
 
 # Official parser plugin for wiki language "WikidPad default 2.0"
-# Last modified (format YYYY-MM-DD): 2010-12-25
+# Last modified (format YYYY-MM-DD): 2011-01-12
 
 
@@ -13 +13 @@
 
 import re    # from pwiki.rtlibRepl import re
+from pwiki.WikiExceptions import *
 from pwiki.StringOps import UPPERCASE, LOWERCASE, revStr
 from pwiki.WikiDocument import WikiDocument
@@ -1982 +1983 @@
             # In an anchor of a possible bracketed wiki word
             tofind = line[-mat.end():]
-            wikiWord = revStr(mat.group("wikiWord"))
+            wikiLinkCore = revStr(mat.group("wikiWord"))
+            wikiWord = _TheHelper.resolvePrefixSilenceAndWikiWordLink(
+                    wikiLinkCore, docPage)[2]
+
             anchorBegin = revStr(mat.group("anchorBegin"))
 
@@ -1991 +1995 @@
 
                 for a in anchors:
-                    backStepMap[BracketStart + wikiWord +
+                    backStepMap[BracketStart + wikiLinkCore +
                             BracketEnd +
                             WikiWordAnchorStart + a] = len(tofind)
@@ -2002 +2006 @@
             # In an anchor of a possible camel case word
             tofind = line[-mat.end():]
-            wikiWord = revStr(mat.group("wikiWord"))
+            wikiLinkCore = revStr(mat.group("wikiWord"))
+            wikiWord = _TheHelper.resolvePrefixSilenceAndWikiWordLink(
+                    wikiLinkCore, docPage)[2]
+
             anchorBegin = revStr(mat.group("anchorBegin"))
 
@@ -2011 +2018 @@
                         
                 for a in anchors:
-                    backStepMap[wikiWord + WikiWordAnchorStart +
+                    backStepMap[wikiWord + wikiLinkCore +
                             a] = len(tofind)
             except WikiWordNotFoundException:

branches/mbutscher/work/lib/pwiki/DocPages.py

@@ -1518 +1518 @@
             threadstop=DUMBTHREADSTOP):
 
+        # Step 1: Refresh attributes
         self.refreshAttributesFromPageAst(pageAst, threadstop=threadstop)
 
+        # Some attributes control format details so check if attribute
+        # refresh changed the details
         formatDetails2 = self.getFormatDetails()
         if not formatDetails.isEquivTo(formatDetails2):
@@ -1526 +1529 @@
             return False
 
-        return self.refreshMainDbCacheFromPageAst(pageAst, fireEvent=fireEvent,
+        # Step 2: Refresh todos, link structure ...
+        self.refreshMainDbCacheFromPageAst(pageAst, fireEvent=fireEvent,
                 threadstop=threadstop)
+
+        # Step 3: Update index search data
+        self.putIntoSearchIndex(threadstop=threadstop)
+        
+        return True
+
 
 
@@ -1740 +1750 @@
         """
         with self.textOperationLock:
+            threadstop.testRunning()
+
             if not self.getWikiDocument().isSearchIndexEnabled():
                 return True  # Or false?
@@ -1816 +1828 @@
             if step == -1:
                 self._refreshMetaData(pageAst, formatDetails, threadstop=threadstop)
-    
+
                 with self.textOperationLock:
                     if not liveTextPlaceHold is self.liveTextPlaceHold:

branches/mbutscher/work/lib/pwiki/wikidata/WikiDataManager.py

@@ -1686 +1686 @@
         It also automatically refreshes the index to the latest version if needed.
         """
-#         print "--getSearchIndex1"
         if not self.isSearchIndexEnabled():
             return None
-#         print "--getSearchIndex4"
         
         import whoosh.index, whoosh.writing
@@ -2056 +2054 @@
                 attrs["wikiPage"] = miscevt.getSource()
                 self.fireMiscEventProps(attrs)
-                miscevt.getSource().putIntoSearchIndex()
+#                 miscevt.getSource().putIntoSearchIndex()
             elif miscevt.has_key("saving new wiki page"):            
                 self.autoLinkRelaxInfo = None
-                miscevt.getSource().putIntoSearchIndex()
+#                 miscevt.getSource().putIntoSearchIndex()
             elif miscevt.has_key("reread cc blacklist needed"):
                 self._updateCcWordBlacklist()