Use abridged headings for anchors

[geekigeeki.git] / geekigeeki.py

diff --git a/geekigeeki.py b/geekigeeki.py
index eef3d6c6736ff76f06e0b44f428f359a7eeab9ac..0a441bf5658c4de1ba72199673651ad1d7af0590 100755 (executable)
--- a/geekigeeki.py
+++ b/geekigeeki.py
@@ -177,7 +177,7 @@ def link_tag(params, text=None, ss_class=None, privileged=False):
 
 # Search ---------------------------------------------------
 
-def do_fullsearch(needle):
+def handle_fullsearch(needle):
     send_title(None, 'Full text search for "%s"' % (needle))
 
     needle_re = re.compile(needle, re.IGNORECASE)
@@ -204,7 +204,7 @@ def do_fullsearch(needle):
 
     print_search_stats(len(hits), len(all_pages))
 
-def do_titlesearch(needle):
+def handle_titlesearch(needle):
     # TODO: check needle is legal -- but probably we can just accept any RE
     send_title(None, "Title search for \"" + needle + '"')
 
@@ -222,10 +222,10 @@ def do_titlesearch(needle):
 def print_search_stats(hits, searched):
     print "<p>%d hits out of %d pages searched.</p>" % (hits, searched)
 
-def do_raw(pagename):
+def handle_raw(pagename):
     Page(pagename).send_raw()
 
-def do_edit(pagename):
+def handle_edit(pagename):
     pg = Page(pagename)
     if 'save' in form:
         if form['file'].value:
@@ -237,7 +237,7 @@ def do_edit(pagename):
         pg.msg_text = 'Editing canceled'
         pg.msg_type = 'notice'
         pg.send_page()
-    else:
+    else: # preview or edit
         text = None
         if 'preview' in form:
             text = form['savetext'].value
@@ -339,7 +339,7 @@ class PageFormatter:
         self.in_pre = self.in_table = False
         self.in_header = True
         self.list_indents = []
-        self.tr_cnt = self.h_cnt = 0
+        self.tr_cnt = 0
         self.styles = {
             #wiki   html   enabled?
             "//":  ["em",  False],
@@ -364,9 +364,8 @@ class PageFormatter:
             self.h_level = 0
         else:
             self.h_level = len(word) - 1
-            self.h_cnt += 1
-            #abridged = re.sub('[^a-z_]', '', word.lower().replace(' ', '_'))
-            result = '<h%d id="%d"><a class="heading" href="#%d">¶</a> ' % (self.h_level, self.h_cnt, self.h_cnt)
+            abridged = re.sub('[^A-Za-z0-9_]', '', self.line).lower()
+            result = '<h%d id="%s"><a class="heading" href="#%s">¶</a> ' % (self.h_level, abridged, abridged)
         return result
 
     def _br_repl(self, word):
@@ -395,7 +394,7 @@ class PageFormatter:
 
         macro = globals().get('_macro_' + name)
         if macro:
-            return apply(macro, (name, descr))
+            return macro(name, descr)
         elif img_re.match(name):
             name = relative_url(name)
             # The "extthumb" nonsense works around a limitation of the HTML block model
@@ -478,7 +477,7 @@ class PageFormatter:
     def replace(self, match):
         for type, hit in match.groupdict().items():
             if hit:
-                return apply(getattr(self, '_' + type + '_repl'), (hit,))
+                return getattr(self, '_' + type + '_repl')(hit)
         else:
             raise "Can't handle match " + `match`
 
@@ -524,26 +523,26 @@ class PageFormatter:
         indent_re = re.compile(r"^\s*")
         tr_re = re.compile(r"^\s*\|\|")
         eol_re = re.compile(r"\r?\n")
-        for line in eol_re.split(self.raw.expandtabs()):
+        for self.line in eol_re.split(self.raw.expandtabs()):
             # Skip ACLs
             if self.in_header:
-                if line.startswith('#'):
+                if self.line.startswith('#'):
                     continue
                 self.in_header = False
 
             if self.in_pre:
-                print re.sub(pre_re, self.replace, line)
+                print re.sub(pre_re, self.replace, self.line)
             else:
-                if self.in_table and not tr_re.match(line):
+                if self.in_table and not tr_re.match(self.line):
                     self.in_table = False
                     print '</tbody></table><p>'
 
-                if blank_re.match(line):
+                if blank_re.match(self.line):
                     print '</p><p>'
                 else:
-                    indent = indent_re.match(line)
+                    indent = indent_re.match(self.line)
                     print self._indent_to(len(indent.group(0)))
-                    print re.sub(scan_re, self.replace, line)
+                    print re.sub(scan_re, self.replace, self.line)
 
         if self.in_pre: print '</pre>'
         if self.in_table: print '</tbody></table><p>'
@@ -744,16 +743,11 @@ class Page:
 try:
     execfile("geekigeeki.conf.py")
     form = cgi.FieldStorage()
-    handlers = {
-        'fullsearch':  do_fullsearch,
-        'titlesearch': do_titlesearch,
-        'edit':        do_edit,
-        'raw':         do_raw,
-    }
-
-    for cmd in handlers.keys():
-        if cmd in form:
-            apply(handlers[cmd], (form[cmd].value,))
+
+    for cmd in form:
+        handler = globals().get('handle_' + cmd)
+        if handler:
+            handler(form[cmd].value)
             break
     else:
         path_info = environ.get('PATH_INFO', '')
@@ -773,6 +767,7 @@ try:
         else:
             print "Status: 404 Not Found"
             send_title(None, msg_text='Can\'t work out query: ' + query)
+            send_footer(None)
 except Exception:
     import traceback
     msg_text = traceback.format_exc()