Parser instead of GenParser Char st

[yawbih.git] / Main.hs

diff --git a/Main.hs b/Main.hs
index eb1e82d7cdd1ef04a925e4b392220575199fa698..3c634d36796ec7e71fb86a52138c7974d4b26acd 100644 (file)
--- a/Main.hs
+++ b/Main.hs
@@ -6,19 +6,23 @@ import CGIOutput
 import CGITypes
 import System
 import Wiki
+import Control.Monad
 
 import Text.ParserCombinators.Parsec
 
-testDB = createPGB "wave" "wiki" "wiki" "12wiki34db"
+testDB = createPGB "localhost" "wiki" "wiki" "12wiki34db"
 
+test key = do
+       db <- testDB
+       s <- getCurrent db key 
+       print s
+       
 --main = start [] cgi
 
 main = do 
        db <- testDB
        runWithHook [] (\(key:act) -> showPage db (filter (/= '\\') key)) $ showPage db "MainPage"
 
-ps a = standardQuery "Hello" a
-
 editPage db key = do 
        s <- io $ getCurrent db key 
        s' <- case s of
@@ -32,10 +36,7 @@ editPage db key = do
                p empty
                text "Comment: "
                c <- textInputField (fieldSIZE 20)
-               --p $ submit (F2 t a) testing (attr "value" "Send")
                p $ defaultSubmit (F3 t a c) (savePage db key) (attr "value" "Send")
-               --submit0 (sp db key []) (attr "value" "Send1")
-
 
 savePage db key (F3 t a c) = do
        io $ update db key fulltext author comment
@@ -65,17 +66,32 @@ 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
-               tr $ mapM (\header -> th (text header))
-                       ["Id", "Date", "Author", "Comment"]
-               mapM (revRow db key) list
+       standardQuery key $ do
+               table $ do
+                       tr $ mapM (\header -> th (text header))
+                               ["Id", "Date", "Author", "Comment"]
+                       mapM (revRow db key) list
+               footer db key
+
+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)
 
@@ -128,11 +144,17 @@ toWash ((Heading n d):xs) = do
        heading n $ toWash d
        toWash xs
 toWash ((Url l):xs) = do
-       hlink (URL {unURL = (l)}) (text l)
+       hlink (URL {unURL = (l)}) (text $ stripMailto l)
        toWash xs
 toWash ((Pre s):xs) = do
        pre $ text s
        toWash xs
+toWash ((List l):xs) = do
+       ul $ mapM (\s -> li $ toWash s) l
+       toWash xs
+
+stripMailto ('m':'a':'i':'l':'t':'o':':':xs) = xs
+stripMailto xs = xs
 
 heading 1 = h1
 heading 2 = h2