possible to list all keywords

[yawbih.git] / Wiki.hs

diff --git a/Wiki.hs b/Wiki.hs
index 83827cc1a6e6fbb9e04059f91350b99a0ae824cd..a2b6548509f8282f73af4d2059216c4b91c23673 100644 (file)
--- a/Wiki.hs
+++ b/Wiki.hs
@@ -1,10 +1,11 @@
 module Wiki (
-       Backend (getCurrent,getList,get,setCurrent,update)
+       Backend (getCurrent,getList,get,setCurrent,update,listKeys)
        ,PGB
        ,createPGB
-       ,Markup (Text, Paragraph, Link, Bold, Emph, Heading, Url, Underline, Strike)
+       ,Markup (Text, Paragraph, Link, Bold, Emph, Heading, Url, Underline, Strike, Pre)
        ,Document
        ,wikiParser
+       ,htmlOutput
 
 ) where
 
@@ -28,6 +29,9 @@ class Backend a where
        --Keyword -> Full text -> id
        update :: a -> String -> String -> String -> String -> IO String
 
+       --[Keyword]
+       listKeys :: a -> IO [String]
+
 data Markup = Text String
        | Paragraph 
        | Link String String
@@ -37,6 +41,7 @@ data Markup = Text String
        | Url String
        | Underline [Markup]
        | Strike [Markup]
+       | Pre String
 
 type Document = [Markup]
 
@@ -77,30 +82,20 @@ pLink = do
                [] -> return (Link l l)
                _ -> return (Link l d)
 
-pBold = do
-       string "**"
-       s <- pStringParser "**"
-       return (Bold s)
-
-pEmph = do
-       string "//"
-       s <- pStringParser "//"
-       return (Emph s)
-
-pUnderline = do
-       string "__"
-       s <- pStringParser "__"
-       return (Underline s)
+pBold = pS "**" (\s -> Bold s)
+pEmph = pS "//" (\s -> Emph s)
+pUnderline = pS "__" (\s -> Underline s)
+pStrike = pS "--" (\s -> Strike s)
 
-pStrike = do
-       string "--"
-       s <- pStringParser "--"
-       return (Strike s)
+pS s f = do
+       string s
+       s <- pStopAt s
+       return (f s)
 
-pStringParser xs = do 
+pStopAt xs = do 
        try (string xs >> return []) <|> (do
                s <- pMain 
-               ss <- pStringParser xs
+               ss <- pStopAt xs
                return (s:ss))
 
 pString xs = do
@@ -113,7 +108,7 @@ pHeading = do
        many1 pEol
        level <- many1 $ char '='
        char ' '
-       s <- pStringParser (' ':level)
+       s <- pStopAt (' ':level)
        return (Heading (length level) s)
 
 pURL = do
@@ -121,10 +116,16 @@ pURL = do
        string "://"
        s <- many1 (alphaNum <|> oneOf "?.:&-/")
        return (Url (proto++"://"++s))
+
+pPre = do
+       string "<pre>"
+       s <- pString "</pre>"
+       return (Pre s)
        
 pMain = try (pHeading)
        <|> (try (pPara) 
        <|> pSpace 
+       <|> try(pPre) 
        <|> try(pBold) 
        <|> try(pEmph) 
        <|> try(pUnderline) 
@@ -193,9 +194,34 @@ instance Backend PGB where
                                [[id]] <- selectReturnTuples db $ "SELECT currval('fulltexts_id_seq')" 
                                setCurrent (PGB db) key id
                                return id
+
+       listKeys (PGB db) = do
+               list <- selectReturnTuples db $ "SELECT keyword FROM fulltexts GROUP BY keyword ORDER BY lower(keyword)"
+               case list of
+                       [[]] -> return []
+                       _ -> mapM (\[key] -> return key) list
+               
                        
 
 tov :: String -> String
 tov s = '\'':escapeQuery s++"'"
                
-
+toHtml :: [Markup] -> String
+toHtml [] = []
+toHtml ((Paragraph):xs) = "<p>\n"++toHtml xs
+toHtml ((Text s):xs) = s++toHtml xs
+toHtml ((Link l d):xs) = "<link: "++l++" desc: "++d++">"++toHtml xs
+toHtml ((Bold d):xs) = "<b>"++toHtml d++"</b>"++toHtml xs
+toHtml ((Emph d):xs) = "<em>"++toHtml d++"</em>"++toHtml xs
+toHtml ((Underline d):xs) = "<u>"++toHtml d++"</u>"++toHtml xs
+toHtml ((Strike d):xs) = "<strike>"++toHtml d++"</strike>"++toHtml xs
+toHtml ((Heading n d):xs) = "\n<h"++show n++">"++toHtml d++"</h"++show n++">\n"++toHtml xs
+toHtml ((Url l):xs) = "<link: "++l++">"++toHtml xs
+toHtml ((Pre s):xs) = "<pre>"++s++"</pre>"++toHtml xs
+
+
+htmlOutput s = case parse wikiParser "" s of
+                                       Right n -> do 
+                                               putStr (toHtml n)
+                                       Left e -> do
+                                               print e