X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;ds=sidebyside;f=macros%2FWordIndex.py;h=b64a3171b85c6b3eede4990cc67ca43c4546923f;hb=2206012d676e2500b6ba5e11f46217654f6d61c1;hp=81cd0f963ff5d137f1208b468f2fa66119e9ff8f;hpb=ae518e2c1f2e6cb7a519d44127deb2e4d255df72;p=geekigeeki.git

diff --git a/macros/WordIndex.py b/macros/WordIndex.py
old mode 100755
new mode 100644
index 81cd0f9..b64a317
--- a/macros/WordIndex.py
+++ b/macros/WordIndex.py
@@ -1,4 +1,4 @@
-def _macro_WordIndex(argv):
+def _macro_WordIndex(*args, **kvargs):
     s = make_index_key()
     pages = list(page_list())
     map = {}
@@ -10,22 +10,22 @@ def _macro_WordIndex(argv):
             except KeyError:
                 map[word] = [name]
 
-    all_words = map.keys()
+    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 = s + '; <a name="%s"><h3>%s</h3></a>' % (letter, letter)
+            s += '<a name="%s"><h3>%s</h3></a>' % (letter, letter)
             last_letter = letter
 
-        s = s + '<b>%s</b><ul>' % word
+        s += '<b>%s</b><ul>' % word
         links = map[word]
         links.sort()
         last_page = None
         for name in links:
             if name == last_page: continue
-            s = s + '<li>' + Page(name).link_to()
-        s = s + '</ul>'
+            s += '<li>' + link_tag(name) + '</li>'
+        s += '</ul>'
     return s