Changeset 3052 for trac/trunk/wiki-macros/TracNav.py

Timestamp:

11/06/05 00:34:43 (8 years ago)

Author:

moschny

Message:

Replace db access code with calls to the wiki api.

File:

• trac/trunk/wiki-macros/TracNav.py (modified) (2 diffs)

trac/trunk/wiki-macros/TracNav.py

@@ -70 +70 @@
 import re
 import sys
+from trac.wiki.api import WikiSystem
+from trac.wiki.model import WikiPage
 
 listRule = re.compile(r"""^(?P<indent> *)\* +(?:(?P<wikilink>\[wiki:(?P<link>(&#34;([^&#34;]*)&#34;|'([^']*)')|([^ \]]+)) +(?P<label>[^\]]*)\])|(?P<text>.*))""", re.M)
 
-def getToc(hdf, env, db, curpage, name):
+def getToc(hdf, env, curpage, name):
+    tocText = "* Table of contents"
+
     preview = hdf.getValue('args.preview', "")
-
-    tocText = "* Table of contents"
     if preview and (name == curpage):
         tocText = hdf.getValue('wiki.page_source', tocText);
     else:
-        cursor = db.cursor()
-        cursor.execute('SELECT text FROM wiki WHERE name=%s ORDER BY version DESC LIMIT 1', name)
-        row = cursor.fetchone()
-        if row:
-            tocText = row[0]
+        if WikiSystem(env).has_page(name):
+            tocText = WikiPage(env, name).text
 
     # env.log.debug(tocText)
@@ -151 +150 @@
 
     db = env.get_db_cnx()
-    toc = parseToc(getToc(hdf, env, db, curpage, name))
+    toc = parseToc(getToc(hdf, env, curpage, name))
     if not toc:
         msg = ''