Changeset 2723

Timestamp:

02/21/05 08:59:18 (8 years ago)

Author:

hauma

Message:

• Bugfix: Use newest version of TOC page for creating the navigation bar. This requires to sort the results from the query in reverse order.
• Allow non-linked headlines in the TOC page. Submenus with non-linked headlines are always displayed expanded, but not displayed at the top.

File:

• trac/trunk/wiki-macros/JPNav.py (modified) (6 diffs)

trac/trunk/wiki-macros/JPNav.py

@@ -14 +14 @@
 
 import re
+import sys
 
-listRule = re.compile(r"""(?P<indent>^\s+)\*\s+\[wiki:(?P<link>(&#34;(.*?)&#34;|'(.*?)')|([^ ]*[^'~_\., \)]))\s+(?P<label>.*)\]""", re.M)
+listRule = re.compile(r"""^(?P<indent> +)\* +(?:(?P<wikilink>\[wiki:(?P<link>(&#34;([^&#34;]*)&#34;|'([^']*)')|([^ \]]+)) +(?P<label>[^\]]*)\])|(?P<text>.*))""", re.M)
 
-def getToc(db, name):
+def getToc(env, db, name):
     cursor = db.cursor()
-    cursor.execute('SELECT text FROM wiki WHERE name=%s', name)
+    cursor.execute('SELECT text FROM wiki WHERE name=%s ORDER BY version DESC LIMIT 1', name)
     row = cursor.fetchone()
     if not row:
@@ -26 +27 @@
     tocText = row[0]
 
+    # env.log.debug(tocText)
+
     stack = [(1, [])]
     nextPos = 0
@@ -31 +34 @@
         match = listRule.search(tocText, nextPos)
         if not match:
+            env.log.debug("No more matches")
             break
 
         indent = len(match.group('indent'))
-        link = match.group('link')
-        label = match.group('label')
+        if match.group('wikilink'):
+            link = match.group('link')
+            label = match.group('label')
+        else:
+            link = None
+            label = match.group('text')
+
+        if link == None:
+            env.log.debug(label + " ---")
+        else:
+            env.log.debug(label + ": " + link)
 
         (lastIndent, list) = stack[len(stack) - 1]
@@ -72 +85 @@
 
     db = env.get_db_cnx()
-    toc = getToc(db, name)
+    toc = getToc(env, db, name)
     if not toc:
         msg = ''
@@ -102 +115 @@
                 cls = ''
             html += '<li%s>' % ( cls )
-            html += '<a href="%s">%s</a>' % (env.href.wiki(name), title)
+            if name == None:
+                html += title
+            else:
+                html += '<a href="%s">%s</a>' % (env.href.wiki(name), title)
             html += '</li>'
         else:
             (subfound, subhtml) = generate(env, curpage, sub, level + 1)
-            if subfound:
+            if subfound or (name == None):
                 menu = ''
                 menu += '<li>'
@@ -113 +129 @@
                 menu += '</li>'
                 found = 1
-                if level == 0:
+                if level == 0 and name != None:
                     html = menu + html
                 else: