%d hits out of %d pages searched.
" % (hits, searched)) +def search_stats(hits, searched): + return("%d hits out of %d pages searched.\n" % (hits, searched)) def handle_fullsearch(query, form): needle = form['q'].value - send_title(None, 'Full text search for "' + needle + '"') + Page().send_title(text='Full text search for "' + needle + '"') needle_re = re.compile(needle, re.IGNORECASE) hits = [] @@ -265,35 +193,31 @@ def handle_fullsearch(query, form): if count: hits.append((count, page_name)) - # The default comparison for tuples compares elements in order, - # so this sorts by number of hits + # The default comparison for tuples compares elements in order, so this sorts by number of hits hits.sort() hits.reverse() - print("' + link_tag(page_name)) - print(' . . . . ' + `count`) - print(['match', 'matches'][count != 1]) - print('
' + link_tag(filename) + "
\{\{\{|\s*\}\}\})
- | (?P \{\{([^\s\|]+)(?:\s*\|\s*([^\]]+)|)\}\})
+ | (?P \{\{[^\}]+\}\})
# Tables
| (?P ^\s*\|\|(=|)\s*)
@@ -614,8 +523,8 @@ class WikiFormatter:
print('')
else:
indent = indent_re.match(self.line)
- #3.0: print(self._indent_to(len(indent.group(0))), end=' ')
print(self._indent_to(len(indent.group(1)), indent.group(2)))
+ # Stand back! Here we apply the monster regex that does all the parsing
print(re.sub(scan_re, self.replace, self.line))
if self.in_pre: print('')
@@ -624,8 +533,8 @@ class WikiFormatter:
print('
')
class Page:
- def __init__(self, page_name):
- self.page_name = page_name
+ def __init__(self, page_name="Limbo"):
+ self.page_name = page_name.rstrip('/');
self.msg_text = ''
self.msg_type = 'error'
@@ -668,19 +577,20 @@ class Page:
out = '== '
pathname = ''
for dirname in self.page_name.strip('/').split('/'):
- pathname = (pathname + '/' + dirname) if pathname else dirname
+ pathname = (pathname and pathname + '/' ) + dirname
out += '[[' + pathname + '|' + dirname + ']]/'
out += ' ==\n'
+ images_out = '\n'
for filename in page_list(self._filename(), file_re):
if image_re.match(filename):
maxwidth = config_get('image_maxwidth', '400')
if maxwidth:
maxwidth = ' | maxwidth=' + str(maxwidth)
- out += '{{' + self.page_name + '/' + filename + ' | ' + humanlink(filename) + maxwidth + ' | class=thumbleft}}\n'
+ images_out += '{{' + self.page_name + '/' + filename + ' | ' + humanlink(filename) + maxwidth + ' | class=thumbleft}}\n'
else:
out += ' * [[' + self.page_name + '/' + filename + ']]\n'
- return out
+ return out + images_out
def pragmas(self):
if not '_pragmas' in self.__dict__:
@@ -723,6 +633,92 @@ class Page:
def can_read(self):
return self.can("read", True)
+ def send_title(self, name=None, text="Limbo", msg_text=None, msg_type='error'):
+ global title_done
+ if title_done: return
+
+ # HEAD
+ emit_header(self._mtime())
+ print('\n')
+ print("%s: %s " % (config_get('site_name', "Unconfigured Wiki"), text))
+ print(' ')
+ if not name:
+ print(' ')
+
+ for http_equiv, content in config_get('meta_urls', {}):
+ print(' ' % (http_equiv, relative_url(content)))
+
+ for link in config_get('link_urls', {}):
+ rel, href = link
+ print(' ' % (rel, relative_url(href)))
+
+ editable = name and self.can_write() and is_privileged()
+ if editable:
+ print(' ' \
+ % relative_url('?a=edit&q=' + name, privileged=True))
+
+ history = config_get('history_url')
+ if history is not None:
+ print(' ' \
+ % relative_url(history + '?a=rss'))
+
+ print('')
+
+ # BODY
+ if editable:
+ print('')
+ else:
+ print('')
+
+ title_done = True
+ send_guru(msg_text, msg_type)
+
+ if self.pragma("navbar", "on") != "on":
+ return
+
+ # NAVBAR
+ print('')
+
+
+ def send_footer(self):
+ if config_get('debug_cgi', False):
+ cgi.print_arguments()
+ cgi.print_form(form)
+ cgi.print_environ()
+ footer = self.pragma("footer", "sys/footer")
+ if footer != "off":
+ link_inline(footer, kvargs = {
+ 'LAST_MODIFIED': strftime(config_get('datetime_fmt', '%a %d %b %Y %I:%M %p'), localtime(self._mtime()))
+ })
+ print("")
+
def send_naked(self, kvargs=None):
if self.can_read():
WikiFormatter(self.get_raw_body(), kvargs).print_html()
@@ -736,13 +732,12 @@ class Page:
global link_urls
link_urls += [ [ "stylesheet", value ] ]
- send_title(self.page_name, self.split_title(),
- msg_text=self.msg_text, msg_type=self.msg_type, writable=self.can_write(), mtime=self._mtime())
+ self.send_title(name=self.page_name, text=self.split_title(), msg_text=self.msg_text, msg_type=self.msg_type)
self.send_naked()
- send_footer(mtime=self._mtime())
+ self.send_footer()
def send_editor(self, preview=None):
- send_title(None, 'Edit ' + self.split_title(), msg_text=self.msg_text, msg_type=self.msg_type)
+ self.send_title(text='Edit ' + self.split_title(), msg_text=self.msg_text, msg_type=self.msg_type)
if not self.can_write():
send_guru("Write access denied by ACLs", "error")
return
@@ -759,11 +754,11 @@ class Page:
print("")
WikiFormatter(preview).print_html()
print("")
- send_footer()
+ self.send_footer()
def send_raw(self, mimetype='text/plain', args=[]):
if not self.can_read():
- send_title(None, msg_text='Read access denied by ACLs', msg_type='notice', mtime=self._mtime())
+ self.send_title(msg_text='Read access denied by ACLs', msg_type='notice')
return
emit_header(self._mtime(), mimetype)
@@ -832,10 +827,11 @@ try:
except Exception:
import traceback
msg_text = traceback.format_exc()
+ page = Page()
if title_done:
send_guru(msg_text, "error")
else:
- send_title(None, msg_text=msg_text)
- send_footer()
+ page.send_title(msg_text=msg_text)
+ page.send_footer()
sys.stdout.flush()