Parser instead of GenParser Char st

[yawbih.git] / Main.hs

diff --git a/Main.hs b/Main.hs
index 3fcb66788db970fcf0bc036539e124470858634e..3c634d36796ec7e71fb86a52138c7974d4b26acd 100644 (file)
--- a/Main.hs
+++ b/Main.hs
@@ -10,16 +10,19 @@ 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
@@ -33,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
@@ -144,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