X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=Main.hs;h=c89ebf27f6fe76e54e40bb372944a69219cba3e8;hb=b0821b704ddf955948416ec8bfa0afcc6512c933;hp=418c16820b88fafff475bcc544eee02f227bcabd;hpb=64b58e5b75b4c8e95574fa9080166f5cf1079005;p=yawbih.git

diff --git a/Main.hs b/Main.hs
index 418c168..c89ebf2 100644
--- 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
@@ -78,10 +78,12 @@ 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
@@ -142,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