X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;ds=inline;f=geekigeeki.py;h=9d443fc6997d5cdf0c39ee774d3c91b3ade82804;hb=151df764ca017e25015fab92838fc00af426179f;hp=4a7ffea7e6250f80fe59a09e9053cf11f4128b4e;hpb=e31aacbe31f2dff141354b7c4d97a16bb86978e1;p=geekigeeki.git
diff --git a/geekigeeki.py b/geekigeeki.py
index 4a7ffea..9d443fc 100755
--- a/geekigeeki.py
+++ b/geekigeeki.py
@@ -3,7 +3,7 @@
#
# Copyright (C) 1999, 2000 Martin Pool
# Copyright (C) 2002 Gerardo Poggiali
-# Copyright (C) 2007, 2008, 2009, 2010 Bernie Innocenti
+# Copyright (C) 2007, 2008, 2009, 2010, 2011 Bernie Innocenti
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
@@ -126,7 +126,7 @@ def send_guru(msg_text, msg_type):
print('' \
% relative_url('sys/GuruMeditation.js'))
-def send_httperror(status="403 Not Found", query="", trace=False):
+def send_httperror(status="404 Not Found", query="", trace=False):
print("Status: %s" % status)
msg_text = "%s: on query '%s'" % (status, query)
if trace:
@@ -152,9 +152,9 @@ def link_tag(dest, text=None, privileged=False, **kvargs):
text = config_get('nonexist_pfx', '') + text
link_class = 'nonexistent'
- # Prevent crawlers from following links potentially added by spammers or to generated pages
+ # Prevent crawlers from following links potentially added by spammers and to autogenerated pages
nofollow = ''
- if link_class == 'external' or link_class == 'navlink':
+ if link_class in ('external', 'navlink', 'nonexistent'):
nofollow = 'rel="nofollow" '
return '%s' % (link_class, nofollow, relative_url(dest, privileged=privileged), text)
@@ -306,13 +306,13 @@ class WikiFormatter:
return '—'
def _tit_repl(self, word):
+ link = permalink(self.line)
if self.h_level:
- result = '\n' % self.h_level
+ result = '¶
\n' % (link, self.h_level)
self.h_level = 0
else:
self.h_level = len(word) - 1
- link = permalink(self.line)
- result = '\n
¶ ' % (self.h_level, link, link)
+ result = '\n
' % (self.h_level, link)
return result
def _br_repl(self, word):