some restructuring and added listKeys to backend

[yawbih.git] / Main.hs

diff --git a/Main.hs b/Main.hs
index ea9316b3f68dedc03091d24ce365ea1766cc0fc9..eb1e82d7cdd1ef04a925e4b392220575199fa698 100644 (file)
--- a/Main.hs
+++ b/Main.hs
@@ -15,7 +15,7 @@ testDB = createPGB "wave" "wiki" "wiki" "12wiki34db"
 
 main = do 
        db <- testDB
-       runWithHook [] (\(key:act) -> showPage db key) $ showPage db "MainPage"
+       runWithHook [] (\(key:act) -> showPage db (filter (/= '\\') key)) $ showPage db "MainPage"
 
 ps a = standardQuery "Hello" a
 
@@ -52,11 +52,11 @@ showPage db key = do
                        Nothing -> text "No text added for this keyword"
                        Just (full, date) -> do
                                parseText full  
-                               p $ text $ "Last edited: "++date
+                               p $ tt $ text $ "Last edited: "++date
                footer db key
 
 parseText full = case parse wikiParser "" full of
-       Right n -> ex n 
+       Right n -> toWash n     
        Left e -> do
                text "PARSE ERROR: "
                text (show e)
@@ -65,7 +65,7 @@ parseText full = case parse wikiParser "" full of
 footer db key = do
        hr empty
        table $ tr $ do
-               td $ submitLink0 (editPage db key) (text "Edit this page")
+               td $ submitLink0 (editPage db key) (text "Edit this keyword")
                td $ submitLink0 (listRevs db key) (text "List old versions")
                td $ text "Keyword: " 
                td $ activate (showPage db) textInputField empty
@@ -91,28 +91,52 @@ showRev db key id = 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
        
-ex [] = return ()
-ex ((Paragraph):xs) = do
+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
-
-
-test s = case parse wikiParser "" s of
-                                       Right n -> do 
-                                               print (ex2 n)
-                                       Left e -> do
-                                               print e
+       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
+
+heading 1 = h1
+heading 2 = h2
+heading 3 = h3
+heading 4 = h4
+heading 5 = h5
+heading 6 = h6