possible to list all keywords

[yawbih.git] / Wiki.hs

diff --git a/Wiki.hs b/Wiki.hs
index f2a68f28e432b1f8005e7ebc31c2b1c4aab5a295..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)
+       ,Markup (Text, Paragraph, Link, Bold, Emph, Heading, Url, Underline, Strike, Pre)
        ,Document
        ,wikiParser
+       ,htmlOutput
 
 ) where
 
@@ -20,7 +21,7 @@ class Backend a where
        getList :: a -> String -> IO [(String, String, String, String)]
 
        --Keyword -> id -> Full text
-       get :: a -> String -> String -> IO String
+       get :: a -> String -> String -> IO (Maybe String)
 
        --Keyword -> id -> ()
        setCurrent :: a -> String -> String -> IO Bool
@@ -28,20 +29,25 @@ 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
+       | Bold [Markup]
+       | Emph [Markup]
+       | Heading Int [Markup]
+       | Url String
+       | Underline [Markup]
+       | Strike [Markup]
+       | Pre String
 
 type Document = [Markup]
 
 wikiParser :: GenParser Char st Document       
 wikiParser = do 
-       s <- (try (pPara) 
-               <|> pSpace 
-               <|> try (pLinkLong)
-               <|> try (pLink)
-               <|> pOtherChar
-               <|> pText)
+       s <- pMain
        ss <- (wikiParser <|> return [])
        return (s:ss)
 
@@ -59,46 +65,84 @@ pEol = char '\n' <|> do
        char '\r'
        char '\n'
 
-pLinkLong = do
-       string "[["
-       l <- many1 $ noneOf ['|']
-       char '|'
-       d <- many1 $ noneOf [']'] 
-       string "]]"
-       return (Link l d)
+pLinkParser = do try (string "]]" >> return ([],[])) 
+       <|> try (do
+               string " | "
+               d <- pString "]]"
+               return ([],d))
+       <|> (do
+               c <- anyChar
+               (l,d) <- pLinkParser
+               return (c:l,d))
+
 pLink = do
        string "[["
-       l <- many1 $ noneOf ['|','[',']']
-       string "]]"
-       return (Link l l)
+       (l,d) <- pLinkParser
+       case d of
+               [] -> return (Link l l)
+               _ -> return (Link l d)
+
+pBold = pS "**" (\s -> Bold s)
+pEmph = pS "//" (\s -> Emph s)
+pUnderline = pS "__" (\s -> Underline s)
+pStrike = pS "--" (\s -> Strike s)
+
+pS s f = do
+       string s
+       s <- pStopAt s
+       return (f s)
+
+pStopAt xs = do 
+       try (string xs >> return []) <|> (do
+               s <- pMain 
+               ss <- pStopAt xs
+               return (s:ss))
+
+pString xs = do
+       try (string xs >> return []) <|> (do
+       s <- anyChar
+       ss <- pString xs
+       return (s:ss))
+       
+pHeading = do
+       many1 pEol
+       level <- many1 $ char '='
+       char ' '
+       s <- pStopAt (' ':level)
+       return (Heading (length level) s)
+
+pURL = do
+       proto <- many1 letter
+       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) 
+       <|> try(pStrike) 
+       <|> try (pLink)
+       <|> try (pURL)
+       <|> pOtherChar
+       <|> pText)      
+
 pOtherChar = do
-       c <- satisfy validChar
+       c <- oneOf "*,;.:!?[]()'\"=-%$£<>/\\|"
        return (Text (c:[]))
 
 pText = do
        t <- many1 alphaNum--(noneOf ['\n','\r','[',']'])
        return (Text t)
 
-validChar ',' = True
-validChar '.' = True
-validChar '!' = True
-validChar '?' = True
-validChar '[' = True
-validChar ']' = True
-validChar '\'' = True
-validChar '"' = True
-validChar '=' = True
-validChar '-' = True
-validChar '%' = True
-validChar '$' = True
-validChar '£' = True
-validChar '<' = True
-validChar '>' = True
-validChar '/' = True
-validChar '\\' = True
-validChar '|' = True
-validChar _ = False
-
 
 newtype PGB = PGB DBService
 
@@ -118,9 +162,15 @@ instance Backend PGB where
 
        getList (PGB db) key = do
                list <- selectReturnTuples db $ "SELECT id, timestamp, author, comment from fulltexts WHERE keyword = "++tov key
-               return $ map (\[id,date,author,comment] -> (id,date,author,comment)) list
-
-       get (PGB db) key id = return ""
+               case list of
+                       [[]] -> return []
+                       _ -> return $ map (\[id,date,author,comment] -> (id,date,author,comment)) list
+
+       get (PGB db) key id = do
+               list <- selectReturnTuples db $ "SELECT fulltext from fulltexts WHERE id = "++tov id    
+               case list of
+                       [s]:_ -> return (Just s)
+                       _ -> return Nothing
 
        setCurrent (PGB db) key id = do
                full <- selectReturnTuples db $ "SELECT keyword FROM fulltexts WHERE keyword="++tov key++" AND id='"++id++"'"
@@ -144,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