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

diff --git a/Main.hs b/Main.hs
index b261901..418c168 100644
--- a/Main.hs
+++ b/Main.hs
@@ -6,6 +6,7 @@ import CGIOutput
 import CGITypes
 import System
 import Wiki
+import Control.Monad
 
 import Text.ParserCombinators.Parsec
 
@@ -15,7 +16,7 @@ testDB = createPGB "wave" "wiki" "wiki" "12wiki34db"
 
 main = do 
 	db <- testDB
-	runWithHook [] (\(key:act) -> sp db key) $ sp db "MainPage"
+	runWithHook [] (\(key:act) -> showPage db (filter (/= '\\') key)) $ showPage db "MainPage"
 
 ps a = standardQuery "Hello" a
 
@@ -36,58 +37,120 @@ editPage db key = do
 		p $ defaultSubmit (F3 t a c) (savePage db key) (attr "value" "Send")
 		--submit0 (sp db key []) (attr "value" "Send1")
 
-sp db key = do
-	s <- io $ getCurrent db key 
-	standardQuery key $ showPage db key s
 
 savePage db key (F3 t a c) = do
 	io $ update db key fulltext author comment
-	s <- io $ getCurrent db key 
-	standardQuery key $ do
-		showPage db key s
+	showPage db key 
   where
   	fulltext = value t
 	author = value a
 	comment = value c 
 
-showPage db key s = do
+showPage db key = do
+	s <- io $ getCurrent db key 
+	standardQuery key $ do
 		case s of
 			Nothing -> text "No text added for this keyword"
 			Just (full, date) -> do
-				case parse wikiParser "" full of
-					Right n -> ex n	
-					Left e -> do
-						text "PARSE ERROR: "
-						text (show e)
-						p $ text full
-				p $ text $ "Last edited: "++date
+				parseText full	
+				p $ tt $ text $ "Last edited: "++date
 		footer db key
 
+parseText full = case parse wikiParser "" full of
+	Right n -> toWash n	
+	Left e -> do
+		text "PARSE ERROR: "
+		text (show e)
+		p $ text full
+
 footer db key = do
 	hr empty
 	table $ tr $ do
-		td $ submitLink0 (editPage db key) (text "Edit this page")
-		td $ text "Keyword: " >> activate (sp db) textInputField empty
+		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
 
-ex [] = return ()
-ex ((Paragraph):xs) = do
+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)
+
+revRow db key (id, date, author, comment) = tr $ do
+	td $ submitLink0 (showRev db key id) (text id) 
+	td $ text date
+	td $ linkKey db author
+	td $ text comment
+
+showRev db key id = do
+	s <- io $ get db key id
+	standardQuery key $ do
+		case s of 
+			Nothing -> text "No such revision"
+			Just s -> parseText s
+		p empty
+		submitLink0 (changeCurrent db key id) (text "Set this version as the current one")
+		footer db key
+changeCurrent db key id = do
+	b <- io $ setCurrent db key id
+	if b then showPage db key
+		else standardQuery key $ do
+			text "Could not set this revision as the current active one."
+			p empty
+			linkKey db key
+	
+toWash [] = return ()
+toWash ((Paragraph):xs) = do
 	p empty
-	ex xs
-ex ((Text s):xs) = do
+	toWash xs
+toWash ((Text s):xs) = do
 	text s
-	ex xs
-ex ((Link l d):xs) = do
+	toWash xs
+toWash ((Link l d):xs) = do
 	hlink (URL {unURL = ("wiki?"++l)}) (text d)
-	ex xs
-
-ex2 [] = []
-ex2 ((Paragraph):xs) = "<p>"++ex2 xs
-ex2 ((Text s):xs) = s++ex2 xs
-ex2 ((Link l d):xs) = "<link: "++l++" desc: "++d++">"++ex2 xs
-
+	toWash xs
+toWash ((Bold d):xs) = do
+	b (toWash d)
+	toWash xs
+toWash ((Emph d):xs) = do
+	em (toWash d)
+	toWash xs
+toWash ((Underline d):xs) = do
+	u (toWash d)
+	toWash xs
+toWash ((Strike d):xs) = do
+	strike (toWash d)
+	toWash xs
+toWash ((Heading n d):xs) = do
+	heading n $ toWash d
+	toWash xs
+toWash ((Url l):xs) = do
+	hlink (URL {unURL = (l)}) (text l)
+	toWash xs
+toWash ((Pre s):xs) = do
+	pre $ text s
+	toWash xs
 
-test s = case parse wikiParser "" s of
-					Right n -> do 
-						print (ex2 n)
-					Left e -> do
-						print e
+heading 1 = h1
+heading 2 = h2
+heading 3 = h3
+heading 4 = h4
+heading 5 = h5
+heading 6 = h6