X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=Main.hs;h=c89ebf27f6fe76e54e40bb372944a69219cba3e8;hb=b0821b704ddf955948416ec8bfa0afcc6512c933;hp=4e9572cbaf0b246a96667069a304dab7c6acf549;hpb=01c59ac502d71c3c1ccac422b5665f9e5954a190;p=yawbih.git

diff --git a/Main.hs b/Main.hs
index 4e9572c..c89ebf2 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,20 @@ 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 o l):xs) = do
+	listType o $ mapM (\s -> li $ toWash s) l
+	toWash xs
+
+listType True = ol
+listType False = ul
+
+stripMailto ('m':'a':'i':'l':'t':'o':':':xs) = xs
+stripMailto xs = xs
 
 heading 1 = h1
 heading 2 = h2