Move macros into the wiki

diff --git a/geekigeeki.py b/geekigeeki.py
index f906c07c53e638a08e55d9062aa0d10b95cfcbf6..01027ee23b69b7da0a60f32c2925ab4f04dcfb1c 100755 (executable)
--- a/geekigeeki.py
+++ b/geekigeeki.py
@@ -331,7 +331,7 @@ def handle_get(pagename, form):
         else:
             send_httperror("403 Forbidden", pagename)
 
-# Used by macros/WordIndex and macros/TitleIndex
+# Used by sys/macros/WordIndex and sys/macros/TitleIndex
 def make_index_key():
     links = ['<a href="#%s">%s</a>' % (ch, ch) for ch in 'abcdefghijklmnopqrstuvwxyz']
     return '<p style="text-align: center">' + ' | '.join(links) + '</p>'
@@ -415,7 +415,7 @@ class WikiFormatter:
                 return self.kvargs[args[0]]
             macro = globals().get('_macro_' + args[0])
             if not macro:
-                exec(open("macros/" + args[0] + ".py").read(), globals())
+                exec(open("sys/macros/" + args[0] + ".py").read(), globals())
                 macro = globals().get('_macro_' + args[0])
             return macro(*args, **kvargs)
         except Exception, e:

diff --git a/macros/CgiVar.py b/macros/CgiVar.py
deleted file mode 100644 (file)
index 9e80e38..0000000
--- a/macros/CgiVar.py
+++ /dev/null
@@ -1,7 +0,0 @@
-def _macro_CgiVar(*args, **kvargs):
-    return {
-        'REMOTE_USER': remote_user(),
-        'REMOTE_HOST': get_hostname(remote_host()),
-        'REMOTE_ADDR': remote_host(),
-        'QUERY_STRING': relative_url(query_string()),
-    }[args[1]]

diff --git a/macros/HttpGet.py b/macros/HttpGet.py
deleted file mode 100644 (file)
index bc122a9..0000000
--- a/macros/HttpGet.py
+++ /dev/null
@@ -1,6 +0,0 @@
-def _macro_HttpGet(*args, **kvargs):
-    if args[1] in form:
-        return form[args[1]].value
-    elif len(args) > 2:
-        return args[2] # default value
-    raise Exception("Undefined argument " + args[1])

diff --git a/macros/HttpPost.py b/macros/HttpPost.py
deleted file mode 100644 (file)
index bf2ed01..0000000
--- a/macros/HttpPost.py
+++ /dev/null
@@ -1,6 +0,0 @@
-def _macro_HttpPost(*args, **kvargs):
-    if args[1] in form:
-        return form[argv[1]].value
-    elif len(args) > 2:
-        return args[2] # default value
-    raise Exception("Undefined argument " + args[1])

diff --git a/macros/TitleIndex.py b/macros/TitleIndex.py
deleted file mode 100644 (file)
index f35651a..0000000
--- a/macros/TitleIndex.py
+++ /dev/null
@@ -1,14 +0,0 @@
-def _macro_TitleIndex(*args, **kvargs):
-    s = make_index_key()
-    pages = list(page_list())
-    pages.sort()
-    current_letter = None
-    for name in pages:
-        letter = name[0].lower()
-        if letter != current_letter:
-            s += '<a name="%s"><h3>%s</h3></a>' % (letter, letter)
-            current_letter = letter
-        else:
-            s += '<br />'
-        s += link_tag(name)
-    return s

diff --git a/macros/WordIndex.py b/macros/WordIndex.py
deleted file mode 100644 (file)
index b64a317..0000000
--- a/macros/WordIndex.py
+++ /dev/null
@@ -1,31 +0,0 @@
-def _macro_WordIndex(*args, **kvargs):
-    s = make_index_key()
-    pages = list(page_list())
-    map = {}
-    word_re = re.compile('[A-Z][a-z]+')
-    for name in pages:
-        for word in word_re.findall(name):
-            try:
-                map[word].append(name)
-            except KeyError:
-                map[word] = [name]
-
-    all_words = list(map.keys())
-    all_words.sort()
-    last_letter = None
-    # set title
-    for word in all_words:
-        letter = word[0].lower()
-        if letter != last_letter:
-            s += '<a name="%s"><h3>%s</h3></a>' % (letter, letter)
-            last_letter = letter
-
-        s += '<b>%s</b><ul>' % word
-        links = map[word]
-        links.sort()
-        last_page = None
-        for name in links:
-            if name == last_page: continue
-            s += '<li>' + link_tag(name) + '</li>'
-        s += '</ul>'
-    return s