Changeset 247 for branches/mbutscher/work/lib/pwiki/wikidata/WikiDataManager.py

Timestamp:

01/30/11 12:14:27 (2 years ago)

Author:

mbutscher

Message:

branches/stable-2.0:
2.0final

branches/mbutscher/work:
2.1beta11
* Option to show iframe content from external

sources inside the HTML IE preview

* Remove plus signs in front of headings in page

structure view, use indentation instead

* Translating of menu accelerators enhanced

(scanning for all 16 bit unicode characters)

* Internal, index search: Store a format number for

search index and rebuild index if number doesn't
match the number for current WikidPad version

* Internal: Moved system detection functions from

"Configuration" to new module "SystemInfo?", made
more imports relative

* Experimental, Windows: Option to control if to

scroll control under pointer with mouse wheel on
Windows (instead of focused control)

* Reordered some options (on global "Advanced" page

and below)

Files:

• branches/mbutscher/work/lib/pwiki/wikidata/WikiDataManager.py (modified) (10 diffs)

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

@@ -20 +20 @@
 from .. import ParseUtilities
 from ..StringOps import mbcsDec, re_sub_escape, pathEnc, pathDec, \
-        unescapeWithRe, strToBool
+        unescapeWithRe, strToBool, pathnameFromUrl, urlFromPathname, \
+        relativeFilePath
 from ..DocPages import DocPage, WikiPage, FunctionalPage, AliasWikiPage
 # from ..timeView.Versioning import VersionOverview
@@ -341 +342 @@
             dataDir = os.path.join(os.path.dirname(wikiConfigFilename), dataDir)
 
-#         dataDir = mbcsDec(os.path.abspath(dataDir), "replace")[0]
         dataDir = pathDec(os.path.abspath(dataDir))
-
-#         self.wikiConfigFilename = wikiConfigFilename
 
         if not dbtype:
@@ -395 +393 @@
         self.wikiPageDict = WeakValueDictionary()
         self.funcPageDict = WeakValueDictionary()
-
+        
         self.updateExecutor = SingleThreadExecutor(4)
         self.pageRetrievingLock = TimeoutRLock(Consts.DEADBLOCKTIMEOUT)
@@ -473 +471 @@
             
         self.updateExecutor.start()
-        
+
+        if self.isSearchIndexEnabled() and self.getWikiConfig().getint(
+                "main", "indexSearch_formatNo", 1) != Consts.SEARCHINDEX_FORMAT_NO:
+            # Search index rebuild needed
+            # Remove old search index and lower meta data state.
+            # The following pushDirtyMetaDataUpdate() will start rebuilding
+
+            wikiData = self.getWikiData()
+
+            wikiData.commit()
+            finalState = Consts.WIKIWORDMETADATA_STATE_SYNTAXPROCESSED
+
+            for wikiWord in wikiData.getWikiWordsForMetaDataState(
+                    finalState, "<"):
+                wikiData.setMetaDataState(wikiWord, finalState)
+
+            wikiData.commit()
+            self.removeSearchIndex()
+
         self.pushDirtyMetaDataUpdate()
         
@@ -714 +730 @@
             wikiConfig.setWriteAccessDenied(False)
             wikiConfig.set("main", "wiki_readOnly", "False")
+
+
+
+    def makeRelUrlAbsolute(self, relurl):
+        """
+        Return the absolute file: URL for a rel: URL
+        """
+        relpath = pathnameFromUrl(relurl[6:], False)
+
+        url = u"file:" + urlFromPathname(
+                os.path.abspath(os.path.join(os.path.dirname(
+                        self.getWikiConfigPath()), relpath)))
+
+        return url
+
+
+    def makeAbsPathRelUrl(self, absPath):
+        """
+        Return the rel: URL for an absolute file path or None if
+        a relative URL can't be created
+        """
+        locPath = self.getWikiConfigPath()
+
+        if locPath is None:
+            return None
+
+        locPath = os.path.dirname(locPath)
+        relPath = relativeFilePath(locPath, absPath)
+        if relPath is None:
+            return None
+
+        return u"rel://" + urlFromPathname(relPath)
+
 
 
@@ -924 +973 @@
                 # No active page available
                 realWikiWord = self.getUnAliasedWikiWordOrAsIs(wikiWord)
-#                 print "--_getWikiPageNoErrorNoCache13", repr((wikiWord, realWikiWord))
                 if wikiWord == realWikiWord:
                     # no alias
@@ -1607 +1655 @@
             resultList = s.search(q, limit=None)
             
-#             docnumList = [(rd.docnum, rd["unifName"]) for rd in resultList]
-#             
-#             docnumList.sort()
-#             docpp = "\n".join(["%3i %s" % rd for rd in docnumList])
-# 
-#             print "--docResults"
-#             print docpp.encode("mbcs", "replace")
-
             result = [rd["unifName"][9:] for rd in resultList
                     if rd["unifName"].startswith(u"wikipage/")]
@@ -1663 +1703 @@
 
     def removeSearchIndex(self):
-        if self.isSearchIndexEnabled():
-            raise InternalError("Calling removeSearchIndex() while index is enabled")
+#         if self.isSearchIndexEnabled():
+#             raise InternalError("Calling removeSearchIndex() while index is enabled")
         
         p = self.updateExecutor.pause(wait=True)
@@ -1680 +1720 @@
             shutil.rmtree(indexPath, ignore_errors=True)
 
+        self.getWikiConfig().set("main", "indexSearch_formatNo", u"0")
+
 
     def getSearchIndex(self, clear=False):
@@ -1704 +1746 @@
 
             self.whooshIndex = whoosh.index.open_dir(indexPath)
+            
+            self.getWikiConfig().set("main", "indexSearch_formatNo",
+                    unicode(Consts.SEARCHINDEX_FORMAT_NO))
 
         self.whooshIndex = self.whooshIndex.refresh()
+
         return self.whooshIndex