X-Git-Url: https://ruin.nu/git/?p=yawbih.git;a=blobdiff_plain;f=Main.hs;h=3c634d36796ec7e71fb86a52138c7974d4b26acd;hp=4e9572cbaf0b246a96667069a304dab7c6acf549;hb=0fa0fc355546141e597b7c483f8c6b9e54ac17ce;hpb=01c59ac502d71c3c1ccac422b5665f9e5954a190 diff --git a/Main.hs b/Main.hs index 4e9572c..3c634d3 100644 --- a/Main.hs +++ b/Main.hs @@ -10,8 +10,13 @@ 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 @@ -139,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