possible to list all keywords

[yawbih.git] / Main.hs

diff --git a/Main.hs b/Main.hs
index 2457b058632e32edc520c090bf631d33f86b5063..418c16820b88fafff475bcc544eee02f227bcabd 100644 (file)
--- a/Main.hs
+++ b/Main.hs
@@ -6,6 +6,7 @@ import CGIOutput
 import CGITypes
 import System
 import Wiki
+import Control.Monad
 
 import Text.ParserCombinators.Parsec
 
@@ -56,7 +57,7 @@ showPage db key = do
                footer db key
 
 parseText full = case parse wikiParser "" full of
-       Right n -> ex n 
+       Right n -> toWash n     
        Left e -> do
                text "PARSE ERROR: "
                text (show e)
@@ -65,11 +66,16 @@ parseText full = case parse wikiParser "" full of
 footer db key = do
        hr empty
        table $ tr $ do
-               td $ submitLink0 (editPage db key) (text "Edit this keyword")
-               td $ submitLink0 (listRevs db key) (text "List old versions")
+               td $ submitLink0 (showPage db "MainPage") (text "Back to main page")
+               when (e key) $ td $ submitLink0 (editPage db key) (text "Edit this keyword")
+               when (e key) $ td $ submitLink0 (listRevs db key) (text "List old versions")
+               td $ submitLink0 (listKeywords db) (text "List all keywords")
                td $ text "Keyword: " 
                td $ activate (showPage db) textInputField empty
 
+e "" = False
+e _ = True
+
 listRevs db key = do 
        list <- io $ getList db key 
        standardQuery key $ table $ do
@@ -77,6 +83,14 @@ listRevs db key = do
                        ["Id", "Date", "Author", "Comment"]
                mapM (revRow db key) list
 
+listKeywords db = do 
+       list <- io $ listKeys db
+       standardQuery "List of keywords" $ do
+               table (do
+                       tr $ th (text "Keyword")
+                       mapM (\key -> tr $ td $ linkKey db key) list)
+               footer db ""
+
 linkKey db key = submitLink0 (showPage db key) (text key)
 
 revRow db key (id, date, author, comment) = tr $ do
@@ -102,33 +116,41 @@ changeCurrent db key id = do
                        p empty
                        linkKey db key
        
-ex [] = return ()
-ex ((Paragraph):xs) = do
+toWash [] = return ()
+toWash ((Paragraph):xs) = do
        p empty
-       ex xs
-ex ((Text s):xs) = do
+       toWash xs
+toWash ((Text s):xs) = do
        text s
-       ex xs
-ex ((Link l d):xs) = do
+       toWash xs
+toWash ((Link l d):xs) = do
        hlink (URL {unURL = ("wiki?"++l)}) (text d)
-       ex xs
-ex ((Bold d):xs) = do
-       b (ex d)
-       ex xs
-ex ((Emph d):xs) = do
-       em (ex d)
-       ex xs
-
-ex2 [] = []
-ex2 ((Paragraph):xs) = "<p>"++ex2 xs
-ex2 ((Text s):xs) = s++ex2 xs
-ex2 ((Link l d):xs) = "<link: "++l++" desc: "++d++">"++ex2 xs
-ex2 ((Bold d):xs) = "<b>"++ex2 d++"</b>"++ex2 xs
-ex2 ((Emph d):xs) = "<em>"++ex2 d++"</em>"++ex2 xs
-
-
-test s = case parse wikiParser "" s of
-                                       Right n -> do 
-                                               print (ex2 n)
-                                       Left e -> do
-                                               print e
+       toWash xs
+toWash ((Bold d):xs) = do
+       b (toWash d)
+       toWash xs
+toWash ((Emph d):xs) = do
+       em (toWash d)
+       toWash xs
+toWash ((Underline d):xs) = do
+       u (toWash d)
+       toWash xs
+toWash ((Strike d):xs) = do
+       strike (toWash d)
+       toWash xs
+toWash ((Heading n d):xs) = do
+       heading n $ toWash d
+       toWash xs
+toWash ((Url l):xs) = do
+       hlink (URL {unURL = (l)}) (text l)
+       toWash xs
+toWash ((Pre s):xs) = do
+       pre $ text s
+       toWash xs
+
+heading 1 = h1
+heading 2 = h2
+heading 3 = h3
+heading 4 = h4
+heading 5 = h5
+heading 6 = h6