Changeset 252

Timestamp:

03/15/11 13:26:45 (2 years ago)

Author:

APA

Message:

Support for "heading5"
Beautified Sources in Wikidata/ in order to make them easier comparable

Location:

branches/mbutscher/work

Files:

• Consts.py (modified) (2 diffs)
• extensions/Presentation.py (modified) (3 diffs)
• lib/pwiki/WikiTxtCtrl.py (modified) (126 diffs)
• lib/pwiki/wikidata/compact_sqlite/DbStructure.py (modified) (1 diff)
• lib/pwiki/wikidata/compact_sqlite/WikiData.py (modified) (15 diffs)
• lib/pwiki/wikidata/original_gadfly/WikiData.py (modified) (6 diffs)
• lib/pwiki/wikidata/original_sqlite/DbStructure.py (modified) (2 diffs)
• lib/pwiki/wikidata/original_sqlite/WikiData.py (modified) (5 diffs)

branches/mbutscher/work/Consts.py

@@ -5 +5 @@
 # where branch is normally string "wikidPad", but should be changed if somebody
 # develops a derived version of WikidPad.
-# 
+#
 # major and minor are the main versions,
 # stateAndMicro is:
-#     between 0 and 99 for "alpha" 
+#     between 0 and 99 for "alpha"
 #     between 100 and 199 for "beta"
 #     between 200 and 299 for "rc" (release candidate)
 #     300 for "final"
-#     
+#
 #     the unit and tenth place form the micro version.
-# 
+#
 # patch is a sub-micro version, if needed, normally 0.
-# 
+#
 # Examples:
 # (1, 8, 207, 0) is 1.8rc07
@@ -40 +40 @@
 FormatTypes = Enumeration("FormatTypes", ["Default", "WikiWord",
         "AvailWikiWord", "Bold", "Italic", "Heading1", "Heading2", "Heading3",
-        "Heading4", "Url", "Script", "Attribute", "ToDo"
+        "Heading4", "Heading5", "Url", "Script", "Attribute", "ToDo"
         ], 0)
-        
+
 
 # Store hints for WikiData.storeDataBlock()

branches/mbutscher/work/extensions/Presentation.py

@@ -12 +12 @@
               'other': 'Comic Sans MS',
               'size' : 10,
+              'heading5': 9,
               'heading4': 10,
               'heading3': 11,
@@ -23 +24 @@
               'other': 'new century schoolbook',
               'size' : 10,
+              'heading5': 9,
               'heading4': 10,
               'heading3': 11,
@@ -63 +65 @@
                     "fore:%(colPlaintext)s,face:%(mono)s,size:%(size)d" % styleFaces),
             (FormatTypes.WikiWord,
-                    "fore:%(colPlaintext)s,underline,face:%(mono)s,size:%(size)d" % styleFaces),      
+                    "fore:%(colPlaintext)s,underline,face:%(mono)s,size:%(size)d" % styleFaces),
             (FormatTypes.AvailWikiWord,
-                    "fore:%(colLink)s,underline,face:%(mono)s,size:%(size)d" % styleFaces),      
-            (FormatTypes.Bold, "fore:%(colPlaintext)s,bold,face:%(mono)s,size:%(size)d" % styleFaces),   
-            (FormatTypes.Italic, "fore:%(colPlaintext)s,italic,face:%(mono)s,size:%(size)d" % styleFaces), 
-            (FormatTypes.Heading4, "fore:%(colPlaintext)s,bold,face:%(mono)s,size:%(heading4)d" % styleFaces),       
-            (FormatTypes.Heading3, "fore:%(colPlaintext)s,bold,face:%(mono)s,size:%(heading3)d" % styleFaces),       
-            (FormatTypes.Heading2, "fore:%(colPlaintext)s,bold,face:%(mono)s,size:%(heading2)d" % styleFaces),       
-            (FormatTypes.Heading1, "fore:%(colPlaintext)s,bold,face:%(mono)s,size:%(heading1)d" % styleFaces), 
+                    "fore:%(colLink)s,underline,face:%(mono)s,size:%(size)d" % styleFaces),
+            (FormatTypes.Bold, "fore:%(colPlaintext)s,bold,face:%(mono)s,size:%(size)d" % styleFaces),
+            (FormatTypes.Italic, "fore:%(colPlaintext)s,italic,face:%(mono)s,size:%(size)d" % styleFaces),
+            (FormatTypes.Heading5, "fore:%(colPlaintext)s,bold,face:%(mono)s,size:%(heading5)d" % styleFaces),
+            (FormatTypes.Heading4, "fore:%(colPlaintext)s,bold,face:%(mono)s,size:%(heading4)d" % styleFaces),
+            (FormatTypes.Heading3, "fore:%(colPlaintext)s,bold,face:%(mono)s,size:%(heading3)d" % styleFaces),
+            (FormatTypes.Heading2, "fore:%(colPlaintext)s,bold,face:%(mono)s,size:%(heading2)d" % styleFaces),
+            (FormatTypes.Heading1, "fore:%(colPlaintext)s,bold,face:%(mono)s,size:%(heading1)d" % styleFaces),
             (FormatTypes.Url,
-                    "fore:%(colLink)s,underline,face:%(mono)s,size:%(size)d" % styleFaces), 
+                    "fore:%(colLink)s,underline,face:%(mono)s,size:%(size)d" % styleFaces),
             (FormatTypes.Script,
                     "fore:%(colAttribute)s,face:%(mono)s,size:%(size)d" % styleFaces),

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

@@ -89 +89 @@
 # etEVT_STYLE_DONE_COMMAND = wx.NewEventType()
 # EVT_STYLE_DONE_COMMAND = wx.PyEventBinder(etEVT_STYLE_DONE_COMMAND, 0)
-# 
+#
 # class StyleDoneEvent(wx.PyCommandEvent):
 #     """
@@ -175 +175 @@
         self.SetMarginWidth(self.SELECT_MARGIN, 16)
         self.SetMarginWidth(self.NUMBER_MARGIN, 0)
-        
+
         self.SetMarginType(self.FOLD_MARGIN, wx.stc.STC_MARGIN_SYMBOL)
         self.SetMarginType(self.SELECT_MARGIN, wx.stc.STC_MARGIN_SYMBOL)
@@ -201 +201 @@
         # i plan on lexing myself
         self.SetLexer(wx.stc.STC_LEX_CONTAINER)
-        
+
         # make the text control a drop target for files and text
         self.SetDropTarget(WikiTxtCtrlDropTarget(self))
-        
+
 #         self.CmdKeyClearAll()
-#         
+#
 #         # register some keyboard commands
 #         self.CmdKeyAssign(ord('+'), wx.stc.STC_SCMOD_CTRL, wx.stc.STC_CMD_ZOOMIN)
@@ -216 +216 @@
 #         self.CmdKeyAssign(wx.stc.STC_KEY_END, wx.stc.STC_SCMOD_SHIFT,
 #                 wx.stc.STC_CMD_LINEENDWRAPEXTEND)
-# 
-# 
+#
+#
 #         # Clear all key mappings for clipboard operations
 #         # PersonalWikiFrame handles them and calls the special clipboard functions
@@ -224 +224 @@
 #         self.CmdKeyClear(wx.stc.STC_KEY_INSERT, wx.stc.STC_SCMOD_SHIFT)
 #         self.CmdKeyClear(wx.stc.STC_KEY_DELETE, wx.stc.STC_SCMOD_SHIFT)
-# 
+#
 #         self.CmdKeyClear(ord('X'), wx.stc.STC_SCMOD_CTRL)
 #         self.CmdKeyClear(ord('C'), wx.stc.STC_SCMOD_CTRL)
@@ -246 +246 @@
                 ("options changed", self.onOptionsChanged),
         ), wx.GetApp().getMiscEvent(), self)
-        
+
         self.__sinkGlobalConfig = wxKeyFunctionSink((
                 ("changed configuration", self.onChangedConfiguration),
@@ -280 +280 @@
         wx.stc.EVT_STC_DWELLSTART(self, ID, self.OnDwellStart)
         wx.stc.EVT_STC_DWELLEND(self, ID, self.OnDwellEnd)
-        
+
         wx.EVT_LEFT_DOWN(self, self.OnClick)
         wx.EVT_MIDDLE_DOWN(self, self.OnMiddleDown)
@@ -292 +292 @@
 
         wx.EVT_CONTEXT_MENU(self, self.OnContextMenu)
-        
+
 #         self.incSearchCharStartPos = 0
         self.incSearchPreviousHiddenLines = None
@@ -309 +309 @@
         self.contextMenuTokens = None
         self.contextMenuSpellCheckSuggestions = None
-        
+
         # Connect context menu events to functions
         wx.EVT_MENU(self, GUI_ID.CMD_UNDO, lambda evt: self.Undo())
@@ -330 +330 @@
 
         wx.EVT_MENU(self, GUI_ID.CMD_ADD_THIS_SPELLING_SESSION,
-                self.OnAddThisSpellingToIgnoreSession)        
+                self.OnAddThisSpellingToIgnoreSession)
         wx.EVT_MENU(self, GUI_ID.CMD_ADD_THIS_SPELLING_GLOBAL,
-                self.OnAddThisSpellingToIgnoreGlobal)        
+                self.OnAddThisSpellingToIgnoreGlobal)
         wx.EVT_MENU(self, GUI_ID.CMD_ADD_THIS_SPELLING_LOCAL,
-                self.OnAddThisSpellingToIgnoreLocal)        
-
-        wx.EVT_MENU(self, GUI_ID.CMD_ACTIVATE_THIS, self.OnActivateThis)        
+                self.OnAddThisSpellingToIgnoreLocal)
+
+        wx.EVT_MENU(self, GUI_ID.CMD_ACTIVATE_THIS, self.OnActivateThis)
         wx.EVT_MENU(self, GUI_ID.CMD_ACTIVATE_NEW_TAB_THIS,
-                self.OnActivateNewTabThis)        
+                self.OnActivateNewTabThis)
         wx.EVT_MENU(self, GUI_ID.CMD_ACTIVATE_NEW_TAB_BACKGROUND_THIS,
                 self.OnActivateNewTabBackgroundThis)
@@ -385 +385 @@
             return
 
-        cbIcept = self.presenter.getMainControl().getClipboardInterceptor()  
+        cbIcept = self.presenter.getMainControl().getClipboardInterceptor()
         if cbIcept is not None:
             cbIcept.informCopyInWikidPadStart(text=text)
@@ -406 +406 @@
         if filenames is not None:
             mc = self.presenter.getMainControl()
-    
+
             paramDict = {"editor": self, "filenames": filenames,
                     "x": -1, "y": -1, "main control": mc,
@@ -425 +425 @@
             img = bmp.ConvertToImage()
             del bmp
-            
+
             if self.presenter.getConfig().getboolean("main",
                     "editor_imagePaste_askOnEachPaste", True):
@@ -441 +441 @@
                 # Couldn't find unused filename or saving denied
                 return True
-                
+
 #                 destPath = fs.findDestPathNoSource(u".png", u"")
-#                 
+#
 #                 print "Paste6", repr(destPath)
 #                 if destPath is None:
 #                     # Couldn't find unused filename
 #                     return
-# 
+#
 #                 img.SaveFile(destPath, wx.BITMAP_TYPE_PNG)
 
             url = self.presenter.getMainControl().makeAbsPathRelUrl(destPath)
-            
+
             if url is None:
                 url = u"file:" + StringOps.urlFromPathname(destPath)
-            
+
             self.ReplaceSelection(url)
 
 #             locPath = self.presenter.getMainControl().getWikiConfigPath()
-# 
+#
 #             if locPath is not None:
 #                 locPath = dirname(locPath)
@@ -469 +469 @@
 #                 else:
 #                     url = "rel://%s" % urlFromPathname(relPath)
-# 
+#
 #             if url:
 #                 self.ReplaceSelection(url)
 
             return True
-        
+
         if not WindowsHacks:
             return False
@@ -482 +482 @@
         if destPath is not None:
             url = self.presenter.getMainControl().makeAbsPathRelUrl(destPath)
-            
+
             if url is None:
                 url = u"file:" + StringOps.urlFromPathname(destPath)
-            
+
             self.ReplaceSelection(url)
             return True
@@ -492 +492 @@
 #         if destPath is not None:
 #             locPath = self.presenter.getMainControl().getWikiConfigPath()
-# 
+#
 #             if locPath is not None:
 #                 locPath = dirname(locPath)
@@ -502 +502 @@
 #                 else:
 #                     url = "rel://%s>i" % urlFromPathname(relPath)
-# 
+#
 #                 if url:
 #                     self.ReplaceSelection(url)
@@ -514 +514 @@
         self.Copy()
 
-        
-        
+
+
     def setLayerVisible(self, vis, scName=""):
         """
@@ -535 +535 @@
     def setAutoIndent(self, onOff):
         self.autoIndent = onOff
-        
+
     def getAutoIndent(self):
         return self.autoIndent
@@ -541 +541 @@
     def setAutoBullets(self, onOff):
         self.autoBullets = onOff
-        
+
     def getAutoBullets(self):
         return self.autoBullets
-        
+
     def setTabsToSpaces(self, onOff):
         self.tabsToSpaces = onOff
         self.SetUseTabs(not onOff)
-        
+
     def getTabsToSpaces(self):
         return self.tabsToSpaces
@@ -569 +569 @@
         forceSync -- when setting folding on, the folding is completed
             before function returns iff forceSync is True
-        """ 
+        """
         if onOrOff:
             self.SetMarginWidth(self.FOLD_MARGIN, 16)
@@ -648 +648 @@
         self.SetTargetStart(bs)
         self.SetTargetEnd(be)
-        
+
         if isUnicode():
             self.ReplaceTarget(newText)
@@ -656 +656 @@
 #         text = self.GetText()
 #         text = text[:pos] + newText + text[(pos + len):]
-#         
+#
 #         self.replaceText(text)
 
@@ -662 +662 @@
     def showSelectionByCharPos(self, start, end):
         """
-        Same as SetSelectionByCharPos(), but scrolls to position correctly 
+        Same as SetSelectionByCharPos(), but scrolls to position correctly
         """
         text = self.GetText()
@@ -691 +691 @@
 
         self.AutoCompSetFillUps(u":=")  # TODO Add '.'?
-#         self.SetYCaretPolicy(wxSTC_CARET_SLOP, 2)  
-#         self.SetYCaretPolicy(wxSTC_CARET_JUMPS | wxSTC_CARET_EVEN, 4)  
-        self.SetYCaretPolicy(wx.stc.STC_CARET_SLOP | wx.stc.STC_CARET_EVEN, 4) 
+#         self.SetYCaretPolicy(wxSTC_CARET_SLOP, 2)
+#         self.SetYCaretPolicy(wxSTC_CARET_JUMPS | wxSTC_CARET_EVEN, 4)
+        self.SetYCaretPolicy(wx.stc.STC_CARET_SLOP | wx.stc.STC_CARET_EVEN, 4)
 
 
@@ -739 +739 @@
 
             self.wikiPageSink.disconnect()
-            
+
             self.presenter.setDocPage(None)
 
@@ -747 +747 @@
 #             self.pageAst = None
             self.pageType = "normal"
-        
+
         ## _prof.stop()
 
@@ -756 +756 @@
         content = None
         wikiDataManager = self.presenter.getWikiDocument()
-        
+
         self.presenter.setDocPage(funcPage)
-        
+
         if self.getLoadedDocPage() is None:
             return  # TODO How to handle?
@@ -898 +898 @@
                     self.setFoldInfo(foldInfo)
                     self.GotoPos(lastPos)
-                    
+
                     self.scrollXY(scrollPosX, scrollPosY)
-                
+
 #                     # Bad hack: First scroll to position to avoid a visible jump
 #                     #   if scrolling works, then update display,
 #                     #   then scroll again because it may have failed the first time
-#                     
+#
 #                     self.SetScrollPos(wx.HORIZONTAL, scrollPosX, False)
 #                     screvt = wx.ScrollWinEvent(wx.wxEVT_SCROLLWIN_THUMBTRACK,
@@ -912 +912 @@
 #                             scrollPosX, wx.HORIZONTAL)
 #                     self.ProcessEvent(screvt)
-#                     
+#
 #                     self.SetScrollPos(wx.VERTICAL, scrollPosY, True)
 #                     screvt = wx.ScrollWinEvent(wx.wxEVT_SCROLLWIN_THUMBTRACK,
@@ -920 +920 @@
 #                             scrollPosY, wx.VERTICAL)
 #                     self.ProcessEvent(screvt)
-# 
+#
 #                     self.Update()
-# 
+#
 #                     self.SetScrollPos(wx.HORIZONTAL, scrollPosX, False)
 #                     screvt = wx.ScrollWinEvent(wx.wxEVT_SCROLLWIN_THUMBTRACK,
@@ -930 +930 @@
 #                             scrollPosX, wx.HORIZONTAL)
 #                     self.ProcessEvent(screvt)
-#                     
+#
 #                     self.SetScrollPos(wx.VERTICAL, scrollPosY, True)
 #                     screvt = wx.ScrollWinEvent(wx.wxEVT_SCROLLWIN_THUMBTRACK,
@@ -955 +955 @@
             self._goToNextFormField()
             return True
-        
+
         return False
 
@@ -994 +994 @@
             wx.GetApp().freeWikiLanguageHelper(self.wikiLanguageHelper)
             self.wikiLanguageHelper = docPage.createWikiLanguageHelper()
-        
+
         if self.pageType == u"normal":
             # Scroll page according to the anchor
@@ -1039 +1039 @@
         faces = self.presenter.getDefaultFontFaces().copy()
 
-        if isinstance(self.getLoadedDocPage(), 
+        if isinstance(self.getLoadedDocPage(),
                 (DocPages.WikiPage, DocPages.AliasWikiPage)):
 
@@ -1124 +1124 @@
         Called directly from a doc page to repair the editor state if an
         invalid file signature was detected.
-        
+
         docPage -- calling docpage
         """
@@ -1131 +1131 @@
                         (DocPages.DataCarryingPage, DocPages.AliasWikiPage)):
             return
-        
+
         sd, ud = docPage.getDirty()
         if sd:
@@ -1160 +1160 @@
         if self.getLoadedDocPage() is not None:
             self.wikiPageSink.disconnect()
-            
+
             self.SetDocPointer(None)
             self.applyBasicSciSettings()
@@ -1182 +1182 @@
         text = docPage.getLiveText()  # self.GetText()
         textlen = len(text)
-        
+
         t = self.stylingThreadHolder.getThread()
         if t is not None:
@@ -1209 +1209 @@
 
             sth = self.stylingThreadHolder
-            
+
             delay = self.presenter.getConfig().getfloat(
                     "main", "async_highlight_delay")
@@ -1234 +1234 @@
         templateNames = [n for n in wikiDocument.getAllDefinedWikiPageNames()
                 if templateRe.search(n)]
-        
+
         wikiDocument.getCollator().sort(templateNames)
 
@@ -1278 +1278 @@
         if not isinstance(docPage, DocPages.WikiPage):
             return
-            
+
         if not docPage.isDefined() and not docPage.getDirty()[0]:
             title = _(u"Select Template")
@@ -1300 +1300 @@
         self.pageType = docPage.getAttributes().get(u"pagetype",
                 [u"normal"])[-1]
-        self.handleSpecialPageType()        
+        self.handleSpecialPageType()
         self.presenter.informEditorTextChanged(self)
 
@@ -1307 +1307 @@
     def OnContextMenu(self, evt):
         mousePos = self.ScreenToClient(wx.GetMousePosition())
-        
+
         leftFold = 0
         for i in range(self.FOLD_MARGIN):
@@ -1386 +1386 @@
                     appendToMenuByMenuDesc(templateSubmenu,
                             _CONTEXT_MENU_SELECT_TEMPLATE_IN_TEMPLATE_MENU)
-    
+
                     menu.AppendSeparator()
                     menu.AppendMenu(wx.NewId(), _(u'Use Template'),
@@ -1445 +1445 @@
 
             charStartPos = end
-            
+
 
     def handleDropText(self, x, y, text):
@@ -1477 +1477 @@
 #         self.pageAst = pageAst
         self.foldingseq = foldingseq
-        
+
         def putStyle():
             if stylebytes:
@@ -1496 +1496 @@
                 sleep(delay)
                 threadstop.testRunning()
-            
+
             docPage = self.getLoadedDocPage()
             if docPage is None:
                 return
-            
+
             for i in range(20):   # "while True" is too dangerous
                 formatDetails = docPage.getFormatDetails()
@@ -1511 +1511 @@
 
             stylebytes = self.processTokens(text, pageAst, threadstop)
-            
+
             threadstop.testRunning()
-    
+
             if self.getFoldingActive():
                 foldingseq = self.processFolding(pageAst, threadstop)
@@ -1576 +1576 @@
             for node in pageAst.iterFlatNamed():
                 threadstop.testRunning()
-                
+
                 styleNo = WikiTxtCtrl._TOKEN_TO_STYLENO.get(node.name)
-                
+
                 if styleNo is not None:
                     stylebytes.bindStyle(node.pos, node.strLength, styleNo)
@@ -1596 +1596 @@
                 elif node.name == "value" and "todoEntry" in stack:
                     process(node, stack[:])
-                           
+
                 elif node.name == "heading":
-                    if node.level < 4:
+                    if node.level < 5:
                         styleNo = FormatTypes.Heading1 + \
                                 (node.level - 1)
                     else:
-                        styleNo = FormatTypes.Heading4
+                        styleNo = FormatTypes.Heading5
 
                     stylebytes.bindStyle(node.pos, node.strLength, styleNo)
-                
+
                 elif node.name in ("table", "tableRow", "tableCell",
                         "orderedList", "unorderedList", "indentedText",
@@ -1631 +1631 @@
         levelStack = []
         foldHeader = False
-        
+
         for node in pageAst:
             threadstop.testRunning()
-            
+
             if node.name == "heading":
                 while levelStack and (levelStack[-1][0] != "heading" or
@@ -1654 +1654 @@
             if lfc > 0:
                 foldingseq += [len(levelStack) + 1] * lfc
-                
+
             prevLevel = len(levelStack) + 1
-                
+
         # final line
         foldingseq.append(len(levelStack) + 1)
-        
+
         return foldingseq
 
@@ -1682 +1682 @@
         for i in xrange(self.GetLineCount()):
             self.SetFoldExpanded(i, True)
-        
+
         self.ShowLines(0, self.GetLineCount()-1)
 
@@ -1724 +1724 @@
                 levOut |= 8192
             if self.GetLineVisible(ln):
-                levOut |= 16384            
+                levOut |= 16384
             result[ln] = levOut
-            
+
         return result
 
@@ -1740 +1740 @@
             if levIn & 4096:
                 levComb |= wx.stc.STC_FOLDLEVELHEADERFLAG
-                
+
             self.SetFoldLevel(ln, levComb)
             self.SetFoldExpanded(ln, bool(levIn & 8192))
@@ -1747 +1747 @@
             else:
                 self.HideLines(ln, ln)
-        
+
         self.repairFoldingVisibility()
 
@@ -1755 +1755 @@
         if not self.getFoldingActive():
             return
-            
+
         lc = self.GetLineCount()
-        
+
         if lc == 0:
             return
@@ -1764 +1764 @@
         if lc == 1:
             return
-            
+
         combLevel = self.GetFoldLevel(0)
         prevLevel = combLevel & 4095
@@ -1771 +1771 @@
         prevVisible = True  # First line must always be visible
         prevLn = 0
-        
+
 #         print "0", prevLevel, bool(prevIsHeader), bool(prevIsExpanded), bool(prevVisible)
 
@@ -1788 +1788 @@
                         (prevIsHeader and prevIsExpanded):
                     # if current level is not larger than previous this indicates
-                    # an error except that the previous line is a header line and 
+                    # an error except that the previous line is a header line and
                     # folded (not expanded).
                     # Other possibility of an error is if previous line is a
                     # header and IS expanded.
-                    
+
                     # Show line in these cases
                     self.SetFoldExpanded(prevLn, True) # Needed?
@@ -1815 +1815 @@
 
         wikiPage = self.presenter.getWikiDocument().getWikiPageNoError("ScratchPad")
-        
+
 #         wikiPage.appendLiveText("\n%s\n---------------------------\n\n%s\n" %
 #                 (mbcsDec(strftime("%x %I:%M %p"), "replace")[0], text))
@@ -1839 +1839 @@
         try:
             endCharPos += len(startChars)
-            
+
             if emptySelection:
                 # If selection is empty, cursor will in the end
@@ -1850 +1850 @@
             self.gotoCharPos(startCharPos, scroll=False)
             self.AddText(startChars)
-    
+
             self.gotoCharPos(endCharPos, scroll=False)
             self.AddText(endChars)
@@ -1857 +1857 @@
         finally:
             self.EndUndoAction()
-            
+
 
     def getPageAst(self):
@@ -1887 +1887 @@
                     # Same tab
                     presenter = self.presenter
-                    
+
                 titleFromLink = self.presenter.getConfig().getboolean("main",
                         "wikiPageTitle_fromLinkTitle", False)
-                
+
                 if not titleFromLink or node.titleNode is None:
                     suggNewPageTitle = None
                 else:
                     suggNewPageTitle = node.titleNode.getString()
-                    
+
                 unaliasedTarget = self.presenter.getWikiDocument()\
                         .getUnAliasedWikiWordOrAsIs(node.wikiWord)
 
                 docPage = self.getLoadedDocPage()
-                
+
                 # Contains start and end character position where a search fragment
                 # search should never match
@@ -1922 +1922 @@
                     searchOp.wildCard = "no"   # TODO Why not regex?
                     searchOp.searchStr = searchfrag
-    
+
                     found = presenter.getSubControl("textedit").executeSearch(
                             searchOp, 0)
-                    
+
                     if found[0] >= forbiddenSearchfragHit[0] and \
                             found[0] < forbiddenSearchfragHit[1]:
@@ -1945 +1945 @@
             elif node.name == "insertion":
                 if node.key == u"page":
-                        
+
                     # open the wiki page
                     if tabMode & 2:
@@ -1954 +1954 @@
                         # Same tab
                         presenter = self.presenter
-    
+
                     presenter.openWikiPage(node.value,
                             motionType="child")  # , anchor=node.value)
@@ -1962 +1962 @@
                         presenter.getMainControl().getMainAreaPanel().\
                                 showPresenter(presenter)
-    
+
                     return True
 
@@ -1975 +1975 @@
                     pageAst = self.getPageAst()
                     footnoteId = node.footnoteId
-    
+
                     anchorNode = getFootnoteAnchorDict(pageAst).get(footnoteId)
                     if anchorNode is not None:
@@ -1987 +1987 @@
                                     self.gotoCharPos(fnNode.pos)
                                     break
-    
+
                     return True
                 except NoPageAstException:
@@ -2025 +2025 @@
                 wantedUnknownWords = allUnknownWords.findNodesForCharPos(
                         linkCharPos)
-                
+
                 if linkCharPos > 0 and len(wantedUnknownWords) == 0:
                     # No unknown word found -> try left to cursor
@@ -2139 +2139 @@
                     link = self.presenter.getMainControl()\
                             .makeRelUrlAbsolute(link)
-                
+
                 elif link.startswith(u"file:"):
                     link = self.presenter.getMainControl()\
@@ -2207 +2207 @@
             # Execute all or selected script blocks on the page (or other
             #   related pages)
-            try:            
+            try:
                 pageAst = self.getPageAst()
             except NoPageAstException:
@@ -2213 +2213 @@
 
             scriptNodeGroups = [list(pageAst.iterDeepByName(SCRIPTFORMAT))]
-            
+
             # process script imports
             if securityLevel > 1: # Local import_scripts attributes allowed
@@ -2243 +2243 @@
                     except:
                         pass
-             
+
             if self.presenter.getConfig().getboolean("main",
                     "script_search_reverse", False):
@@ -2297 +2297 @@
 #                 "process_autogenerated_areas"):
 #             return text
-# 
+#
 #         return WikiFormatting.AutoGenAreaRE.sub(ur"\1\2\4", text)
 
@@ -2328 +2328 @@
 #                 "process_autogenerated_areas"):
 #             return text
-# 
+#
 #         # So the text can be referenced from an AGA function
 #         self.agatext = text
-# 
+#
 #         return WikiFormatting.AutoGenAreaRE.sub(self._agaReplace, text)
 
@@ -2394 +2394 @@
         startLine = self.LineFromPosition(byteStart)
         endLine = self.LineFromPosition(byteEnd)
-        
+
         # Just to be sure, shouldn't happen normally
         if endLine < startLine:
             startLine, endLine = endLine, startLine
-        
+
         for checkLine in xrange(endLine, startLine - 1, -1):
             if not self.GetLineVisible(checkLine):
@@ -2440 +2440 @@
                 else:
                     self.HideLines(line, line)
-                
+
                 line += 1
-            
+
         self.incSearchPreviousHiddenLines = None
         self.incSearchPreviousHiddenStartLine = -1
-        
+
         if start == -1:
 #             self.SetSelection(-1, -1)
@@ -2456 +2456 @@
         startLine = self.LineFromPosition(byteStart)
         endLine = self.LineFromPosition(byteEnd)
-        
+
         # Store current show/hide state of lines to show
         shownList = []
         for i in xrange(startLine, endLine + 1):
             shownList.append(self.GetLineVisible(i))
-            
+
         self.incSearchPreviousHiddenLines = shownList
         self.incSearchPreviousHiddenStartLine = startLine
@@ -2489 +2489 @@
 #     def startIncrementalSearch(self, initSearch=None):
 #         sb = self.presenter.getStatusBar()
-# 
+#
 #         self.incSearchCharStartPos = self.GetSelectionCharPos()[1]
 #         self.incSearchPreviousHiddenLines = None
 #         self.incSearchPreviousHiddenStartLine = -1
-# 
+#
 #         rect = sb.GetFieldRect(0)
 #         if isOSX():
 #             # needed on Mac OSX to avoid cropped text
 #             rect = wx._core.Rect(rect.x, rect.y - 2, rect.width, rect.height + 4)
-# 
+#
 #         rect.SetPosition(sb.ClientToScreen(rect.GetPosition()))
-# 
+#
 #         dlg = WikiTxtDialogs.IncrementalSearchDialog(self, -1, self, rect,
 #                 sb.GetFont(), self.presenter, initSearch)
 #         dlg.Show()
-# 
-#     
+#
+#
 #     def executeIncrementalSearch(self, next=False):
 #         """
@@ -2516 +2516 @@
 #             else:
 #                 charStartPos = self.incSearchCharStartPos
-# 
+#
 #             regex = None
 #             try:
@@ -2524 +2524 @@
 #                 # Regex error
 #                 return charStartPos   # ?
-# 
+#
 #             match = regex.search(text, charStartPos, len(text))
 #             if not match and charStartPos > 0:
 #                 match = regex.search(text, 0, charStartPos)
-# 
+#
 #             if match:
 # #                 matchbytestart = self.bytelenSct(text[:match.start()])
 # #                 matchbyteend = matchbytestart + \
 # #                         self.bytelenSct(text[match.start():match.end()])
-# 
+#
 #                 self.setSelectionForIncSearchByCharPos(
 #                         match.start(), match.end())
-# 
+#
 #                 return match.end()
-# 
+#
 #         self.setSelectionForIncSearchByCharPos(-1, -1)
 #         self.GotoPos(self.bytelenSct(text[:self.incSearchCharStartPos]))
-# 
+#
 #         return -1
-# 
-# 
+#
+#
 #     def executeIncrementalSearchBackward(self):
 #         """
@@ -2552 +2552 @@
 #         if len(self.searchStr) > 0:
 #             charStartPos = self.GetSelectionCharPos()[0]
-# 
+#
 #             regex = None
 #             try:
@@ -2560 +2560 @@
 #                 # Regex error
 #                 return charStartPos   # ?
-# 
+#
 #             match = regex.search(text, 0, len(text))
 #             if match:
@@ -2570 +2570 @@
 #                             break
 #                         match = matchNext
-#                         
+#
 #                 else:
 #                     while True:
@@ -2577 +2577 @@
 #                             break
 #                         match = matchNext
-# 
+#
 #                 self.setSelectionForIncSearchByCharPos(match.start(), match.end())
-# 
+#
 #                 return match.start()
-# 
+#
 #         self.setSelectionForIncSearchByCharPos(-1, -1)
 #         self.GotoPos(self.bytelenSct(text[:self.incSearchCharStartPos]))
-# 
+#
 #         return -1
-# 
-# 
+#
+#
 #     def forgetIncrementalSearch(self):
 #         """
@@ -2594 +2594 @@
 #         """
 #         pass
-# 
+#
 #     def resetIncrementalSearch(self):
 #         """
@@ -2602 +2602 @@
 #         self.setSelectionForIncSearchByCharPos(-1, -1)
 #         self.GotoPos(self.bytelenSct(self.GetText()[:self.incSearchCharStartPos]))
-# 
-# 
+#
+#
 #     def endIncrementalSearch(self):
 #         """
@@ -2610 +2610 @@
 #         byteStart = self.GetSelectionStart()
 #         byteEnd = self.GetSelectionEnd()
-# 
+#
 #         self.setSelectionForIncSearchByCharPos(-1, -1)
-#         
+#
 #         self.SetSelection(byteStart, byteEnd)
 #         self.ensureSelectionExpanded()
-# 
-# 
+#
+#
 #     def getContinuePosForSearch(self, sarOp):
 #         """
@@ -2622 +2622 @@
 #         search operation sarOp. It always continues at beginning
 #         or end of current selection.
-#         
+#
 #         If sarOp uses a regular expression, this function may throw
 #         a re.error exception.
 #         """
 #         range = self.GetSelectionCharPos()
-#         
+#
 # #         if sarOp.matchesPart(self.GetSelectedText()) is not None:
 #         if sarOp.matchesPart(self.GetText(), range) is not None:
@@ -2637 +2637 @@
 #             # -> continue searching at the beginning of selection
 #             return range[0]
-# 
-# 
+#
+#
 #     def executeSearch(self, sarOp, searchCharStartPos=-1, next=False):
 #         """
@@ -2647 +2647 @@
 #         if sarOp.booleanOp:
 #             return (-1, -1)  # Not possible
-# 
+#
 #         if searchCharStartPos == -2:
 #             searchCharStartPos = self.getContinuePosForSearch(sarOp)
-# 
+#
 #         text = self.GetText()
 #         if len(sarOp.searchStr) > 0:
@@ -2662 +2662 @@
 #                 # Regex error
 #                 return (-1, -1)  # (self.anchorCharPosition, self.anchorCharPosition)
-#                 
+#
 #             if start is not None:
 #                 self.showSelectionByCharPos(start, end)
-# 
+#
 #                 return found    # self.anchorCharPosition
-# 
+#
 #         self.SetSelection(-1, -1)
 #         self.GotoPos(self.bytelenSct(text[:searchCharStartPos]))
-# 
+#
 #         return (-1, -1)
-#         
-#         
+#
+#
 #     def executeReplace(self, sarOp):
 #         """
@@ -2683 +2683 @@
 # #         found = sarOp.matchesPart(seltext)
 #         range = self.GetSelectionCharPos()
-#         
+#
 # #         if sarOp.matchesPart(self.GetSelectedText()) is not None:
 #         found = sarOp.matchesPart(text, range)
-# 
+#
 #         if found is None:
 #             return -1
-# 
-#         replacement = sarOp.replace(text, found)                    
+#
+#         replacement = sarOp.replace(text, found)
 #         bytestart = self.GetSelectionStart()
 #         self.ReplaceSelection(replacement)
 #         selByteEnd = bytestart + self.bytelenSct(replacement)
 #         selCharEnd = len(self.GetTextRange(0, selByteEnd))
-# 
+#
 #         return selCharEnd
 
@@ -2721 +2721 @@
         bytePos = self.GetCurrentPos()
         lineStartBytePos = self.PositionFromLine(self.LineFromPosition(bytePos))
-        
+
         lineStartCharPos = len(self.GetTextRange(0, lineStartBytePos))
         charPos = lineStartCharPos + len(self.GetTextRange(lineStartBytePos,
@@ -2733 +2733 @@
             self.presenter.getWikiDocument().getCollator().sortByFirst(
                     acResultTuples)
-            
+
             self.autoCompBackBytesMap = dict( (
                     (art[1], self.bytelenSct(text[charPos - art[2]:charPos]))
@@ -2797 +2797 @@
         selByteStart = self.PositionFromLine(self.LineFromPosition(selByteStart))
         selByteEnd = self.PositionFromLine(lastLine + 1)
-        
+
         if extendOverChildren:
             # Extend over all lines which are more indented than the last line
-            
+
             lastLineDeep = StringOps.splitIndentDeepness(self.GetLine(lastLine))[0]
-            
+
             testLine = lastLine + 1
-            while True:            
+            while True:
                 testLineContent = self.GetLine(testLine)
                 if len(testLineContent) == 0:
@@ -2812 +2812 @@
                 if StringOps.splitIndentDeepness(testLineContent)[0] <= lastLineDeep:
                     break
-                
+
                 testLine += 1
 
@@ -2827 +2827 @@
     def OnKeyDown(self, evt):
         key = evt.GetKeyCode()
-        
+
         self.lastKeyPressed = time()
         accP = getAccelPairFromKeyDown(evt)
@@ -2842 +2842 @@
                     selByteStart, selByteEnd = self._getExpandedByteSelectionToLine(
                             bool(accP[0] & wx.ACCEL_SHIFT))
-    
+
                     firstLine = self.LineFromPosition(selByteStart)
                     if firstLine > 0:
@@ -2871 +2871 @@
                     selByteStart, selByteEnd = self._getExpandedByteSelectionToLine(
                             bool(accP[0] & wx.ACCEL_SHIFT))
-    
+
                     lastLine = self.LineFromPosition(selByteEnd)
                     lineCount = self.GetLineCount() - 1
@@ -2901 +2901 @@
                     self.EndUndoAction()
                 return
-            
+
             evt.Skip()
 
@@ -2909 +2909 @@
 #             self.startIncrementalSearch(self.searchStr)
 #             evt.Skip()
-# 
+#
 #         elif matchesAccelPair("StartIncrementalSearch", accP):
 #             # Start incremental search
@@ -2958 +2958 @@
                 bytePos = self.GetCurrentPos()
                 lineStartBytePos = self.PositionFromLine(self.LineFromPosition(bytePos))
-                
+
                 lineStartCharPos = len(self.GetTextRange(0, lineStartBytePos))
                 charPos = lineStartCharPos + len(self.GetTextRange(lineStartBytePos,
@@ -2965 +2965 @@
                 autoUnbullet = self.presenter.getConfig().getboolean("main",
                         "editor_autoUnbullets", False)
-                
+
                 settings = {
                         "autoUnbullet": autoUnbullet,
@@ -2971 +2971 @@
                         "autoIndent": self.autoIndent
                         }
-                
+
                 if self.wikiLanguageHelper.handleNewLineBeforeEditor(self, text,
                         charPos, lineStartCharPos, wikiDocument, settings):
@@ -2979 +2979 @@
             else:
                 evt.Skip()
-            
+
         else:
             super(WikiTxtCtrl, self).OnKeyDown(evt)
@@ -2995 +2995 @@
             evt.Skip()
             return
-            
+
         if key >= wx.WXK_START and (not isUnicode() or evt.GetUnicodeKey() != key):
             evt.Skip()
@@ -3063 +3063 @@
 
         tabMode = Configuration.MIDDLE_MOUSE_CONFIG_TO_TABMODE[middleConfig]
-        
+
         if not self.activateLink(evt.GetPosition(), tabMode=tabMode):
             evt.Skip()
@@ -3081 +3081 @@
 #         else:
 #             textPos = self.PositionFromPoint(evt.GetPosition())
-# 
+#
 #             if (self.isPositionInWikiWord(textPos) or
 #                         self.isPositionInLink(textPos)):
@@ -3096 +3096 @@
 #         if evt.stylebytes:
 #             self.applyStyling(evt.stylebytes)
-#         
+#
 #         if evt.foldingseq:
 #             self.applyFolding(evt.foldingseq)
-# 
+#
 
 
@@ -3128 +3128 @@
             self.ToggleFold(line)
             self.repairFoldingVisibility()
-        
+
         evt.Skip()
-        
-        
+
+
 
     def _threadShowCalltip(self, wikiDocument, charPos, bytePos,
@@ -3179 +3179 @@
                 args=(wikiDocument, charPos, bytePos),
                 kwargs={"threadstop": self.calltipThreadHolder})
-                
+
         self.calltipThreadHolder.setThread(thread)
         thread.start()
@@ -3201 +3201 @@
         x = paramDict.get("x")
         y = paramDict.get("y")
-        
+
         dlgParams = WikiTxtDialogs.FilePasteParams()
 #             config = editor.presenter.getMainControl().getConfig()
@@ -3224 +3224 @@
                 # User abort
                 return
-            
+
             unifActionName = dlgParams.unifActionName
 
@@ -3275 +3275 @@
         for fn in filenames:
             url = StringOps.urlFromPathname(fn)
-    
+
             if fn.endswith(u".wiki"):
                 urls.append(u"wiki:%s" % url)
@@ -3295 +3295 @@
                     # Relative rel: URL
                     url = editor.presenter.getMainControl().makeAbsPathRelUrl(fn)
-                    
+
                     if url is None:
                         url = u"file:" + StringOps.urlFromPathname(fn)
@@ -3331 +3331 @@
 #                 wxGetKeyState(WXK_MBUTTON) or \
 #                 wxGetKeyState(WXK_RBUTTON)
-# 
+#
 #         ctrlPressed = wxGetKeyState(WXK_CONTROL)
-# 
+#
 #         if (not ctrlPressed) or mouseBtnPressed:
 #             self.SetCursor(WikiTxtCtrl.CURSOR_IBEAM)
@@ -3339 +3339 @@
 #         else:
 #             linkPos = self.PositionFromPoint(wxPoint(*self.ScreenToClientXY(*mousePos)))
-# 
+#
 #             if (self.isPositionInWikiWord(linkPos) or
 #                         self.isPositionInLink(linkPos)):
@@ -3368 +3368 @@
         self.fobj = wx.FileDataObject()
         dataob.Add(self.fobj)
-        
+
         self.dataob = dataob
         self.SetDataObject(dataob)
@@ -3403 +3403 @@
         urls = []
 
-        # Necessary because key state may change during the loop                                
+        # Necessary because key state may change during the loop
         controlPressed = wx.GetKeyState(wx.WXK_CONTROL)
         shiftPressed = wx.GetKeyState(wx.WXK_SHIFT)
-        
+
         if isLinux():
             # On Linux, at least Ubuntu, fn may be a UTF-8 encoded unicode(!?)
@@ -3439 +3439 @@
 #         u"action/editor/this/paste/files/insert/url/absolute",
 #         WikiTxtCtrl.userActionPasteFiles)
-# 
+#
 # _ACTION_EDITOR_PASTE_FILES_RELATIVE = UserActionCoord.SimpleAction("",
 #         u"action/editor/this/paste/files/insert/url/relative",
 #         WikiTxtCtrl.userActionPasteFiles)
-# 
+#
 # _ACTION_EDITOR_PASTE_FILES_TOSTORAGE = UserActionCoord.SimpleAction("",
 #         u"action/editor/this/paste/files/insert/url/tostorage",
 #         WikiTxtCtrl.userActionPasteFiles)
-# 
+#
 # _ACTION_EDITOR_PASTE_FILES_ASK = UserActionCoord.SimpleAction("",
 #         u"action/editor/this/paste/files/insert/url/ask",
 #         WikiTxtCtrl.userActionPasteFiles)
-# 
-# 
+#
+#
 # _ACTIONS = (
 #         _ACTION_EDITOR_PASTE_FILES_ABSOLUTE, _ACTION_EDITOR_PASTE_FILES_RELATIVE,

branches/mbutscher/work/lib/pwiki/wikidata/compact_sqlite/DbStructure.py

@@ -897 +897 @@
     return int(connwrap.execSqlQuerySingleItem("select value from settings where key=?",
             (key,), default))
+
+
 
 

branches/mbutscher/work/lib/pwiki/wikidata/compact_sqlite/WikiData.py

@@ -36 +36 @@
 #     pass
 
-
 from pwiki.StringOps import getBinCompactForDiff, applyBinCompact, longPathEnc, \
         longPathDec, binCompactToCompact, fileContentToUnicode, utf8Enc, utf8Dec, \
@@ -61 +60 @@
 
         dbfile = longPathDec(dbfile)
+
         try:
             self.connWrap = DbStructure.ConnectWrapSyncCommit(
@@ -67 +67 @@
             traceback.print_exc()
             raise DbReadAccessError(e)
-        
+
         # Set temporary directory if this is first sqlite use after prog. start
         if not GetApp().sqliteInitFlag:
@@ -105 +105 @@
             GetApp().sqliteInitFlag = True
 
-
         DbStructure.registerSqliteFunctions(self.connWrap)
 
@@ -147 +146 @@
         # return value, used by getContent()
         self.contentDbToOutput = lambda c: utf8Dec(c, "replace")[0]
-        
+
         try:
             # Set marker for database type
@@ -167 +166 @@
             self._createTempTables()
 
-            # reset cache
+            # create word caches
             self.cachedContentNames = None
-    
             self.cachedGlobalAttrs = None
             self.getGlobalAttributes()
@@ -180 +178 @@
                 raise DbReadAccessError(e2)
             raise DbReadAccessError(e)
-            
+
         if lastException:
             raise lastException
@@ -198 +196 @@
         # These schema changes are only on a temporary table so they are not
         # in DbStructure.py
-        self.connWrap.execSql("create temp table temppathfindparents "
+        self.connWrap.execSql("create temp table temppathfindparents "+
                 "(word text primary key, child text, steps integer)")
 
-        self.connWrap.execSql("create index temppathfindparents_steps "
+        self.connWrap.execSql("create index temppathfindparents_steps "+
                 "on temppathfindparents(steps)")
 
 
     # ---------- Direct handling of page data ----------
-    
+
     def getContent(self, word):
+        """
+        Function must work for read-only wiki.
+        """
         try:
             result = self.connWrap.execSqlQuerySingleItem("select content from "+\
@@ -365 +366 @@
                         "created = ?, visited = ? where word = ?",
                         (moddate, creadate, visitdate, word))
+                self.commitNeeded = True
         except (IOError, OSError, sqlite.Error), e:
             traceback.print_exc()
@@ -426 +428 @@
 
 
+
+
     # ---------- Renaming/deleting pages with cache update or invalidation ----------
 
@@ -439 +443 @@
                 self.connWrap.execSql("update wikiwordmatchterms set word = ? where word = ?", (toWord, word))
                 self._renameContent(word, toWord)
-    
                 self.connWrap.commit()
             except:
@@ -449 +452 @@
 
 
-    def deleteWord(self, word):
+    def deleteWord(self, word, delContent=True):
         """
         delete everything about the wikiword passed in. an exception is raised
         if you try and delete the wiki root node.
+        
+        delContent -- Should actual content be deleted as well? (Parameter is
+                not part of official API)
         """
         if word != self.wikiDocument.getWikiName():
@@ -465 +471 @@
                     self.deleteAttributes(word)
                     self.deleteTodos(word)
-                    # self.connWrap.execSql("delete from wikiwordcontent where word = ?", (word,))
-                    self._deleteContent(word)
+                    if delContent:
+                        self._deleteContent(word)
                     self.deleteWikiWordMatchTerms(word, syncUpdate=False)
                     self.deleteWikiWordMatchTerms(word, syncUpdate=True)
@@ -488 +494 @@
             self.connWrap.execSql("update wikiwordcontent set metadataprocessed = ? "
                     "where word = ?", (state, word))
+            self.commitNeeded = True
         except (IOError, OSError, sqlite.Error), e:
             traceback.print_exc()
@@ -511 +518 @@
         self.connWrap.execSql("update wikiwordcontent set metadataprocessed = ?",
                 (state,))
+        self.commitNeeded = True
 
 

branches/mbutscher/work/lib/pwiki/wikidata/original_gadfly/WikiData.py

@@ -141 +141 @@
 
     def getContent(self, word):
+        """
+        Function must work for read-only wiki.
+        """
         try:
             try:
@@ -294 +297 @@
         """
         Returns a tuple with modification, creation and visit date of
-        a word or (None, None, None) if word is not in the database
+        a word or (None, None, None) if word is not in the database.
+        Aliases must be resolved beforehand.
+        Function must work for read-only wiki.
         """
         try:
@@ -313 +318 @@
         """
         Set timestamps for an existing wiki page.
+        Aliases must be resolved beforehand.
         """
         moddate, creadate, visitdate = timestamps[:3]
@@ -427 +433 @@
         if word != self.wikiDocument.getWikiName():
             try:
+                self.connWrap.syncCommit()
                 try:
-                    self.commit()
                     # don't delete the relations to the word since other
                     # pages still have valid outward links to this page.
@@ -460 +466 @@
 
 
-
     def setMetaDataState(self, word, state):
         """
@@ -601 +606 @@
         """
         get the child relations of this word
+        Function must work for read-only wiki.
         existingonly -- List only existing wiki words
         selfreference -- List also wikiWord if it references itself

branches/mbutscher/work/lib/pwiki/wikidata/original_sqlite/DbStructure.py

@@ -350 +350 @@
         finally:
             self.accessLock.release()
-
 
 
@@ -551 +550 @@
 
     rebuildIndices(connwrap)
+
 #     connwrap.execSql("create unique index wikirelations_pkey on wikirelations(word, relation)")
 #     connwrap.execSql("create index wikirelations_word on wikirelations(word)")

branches/mbutscher/work/lib/pwiki/wikidata/original_sqlite/WikiData.py

@@ -165 +165 @@
             # Remember but continue
             lastException = DbWriteAccessError(e)
-    
+
         # Function to convert unicode strings from input to content in database
         # used by setContent
+
         def contentUniInputToDb(unidata):
             return utf8Enc(unidata, "replace")[0]
@@ -403 +404 @@
                         "created = ?, visited = ? where word = ?",
                         (moddate, creadate, visitdate, word))
+                self.commitNeeded = True
         except (IOError, OSError, sqlite.Error), e:
             traceback.print_exc()
@@ -423 +425 @@
                 "visited": Last visit date of page
                 "firstcharpos": Dummy returning very high value
-                
         """
         if withFields is None:
@@ -530 +531 @@
             self.connWrap.execSql("update wikiwords set metadataprocessed = ? "
                     "where word = ?", (state, word))
+            self.commitNeeded = True
         except (IOError, OSError, sqlite.Error), e:
             traceback.print_exc()
@@ -553 +555 @@
         self.connWrap.execSql("update wikiwords set metadataprocessed = ?",
                 (state,))
+        self.commitNeeded = True