headings, urls and maybe some more

[yawbih.git] / Wiki.hs

diff --git a/Wiki.hs b/Wiki.hs
index dee41a10e38dbba467d315c164f5f7aff81b0885..59e592938df2e7fbb25634bb30b65dd357f05735 100644 (file)
--- a/Wiki.hs
+++ b/Wiki.hs
@@ -2,7 +2,7 @@ module Wiki (
        Backend (getCurrent,getList,get,setCurrent,update)
        ,PGB
        ,createPGB
-       ,Markup (Text, Paragraph, Link)
+       ,Markup (Text, Paragraph, Link, Bold, Emph, Heading, Url)
        ,Document
        ,wikiParser
 
@@ -20,7 +20,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
@@ -31,17 +31,16 @@ class Backend a where
 data Markup = Text String
        | Paragraph 
        | Link String String
+       | Bold [Markup]
+       | Emph [Markup]
+       | Heading Int [Markup]
+       | Url 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)
 
@@ -63,46 +62,64 @@ pLinkLong = do
        string "[["
        l <- many1 $ noneOf ['|']
        char '|'
-       d <- many1 $ noneOf [']'] 
+       d <- many1 $ noneOf "]" 
        string "]]"
        return (Link l d)
+
 pLink = do
        string "[["
-       l <- many1 $ noneOf ['|','[',']']
+       l <- many1 $ noneOf "]"
        string "]]"
        return (Link l l)
+
+pBold = do
+       string "**"
+       s <- pStringParser "**"
+       return (Bold s)
+
+pEmph = do
+       string "//"
+       s <- pStringParser "//"
+       return (Emph s)
+
+pStringParser xs = do 
+       try (string xs >> return []) <|> (do
+               s <- pMain 
+               ss <- pStringParser xs
+               return (s:ss))
+
+pHeading = do
+       many1 pEol
+       level <- many1 $ char '='
+       char ' '
+       s <- pStringParser (' ':level)
+       return (Heading (length level) s)
+
+pURL = do
+       proto <- many1 letter
+       string "://"
+       s <- many1 (alphaNum <|> oneOf "?.:&-/")
+       return (Url (proto++"://"++s))
+       
+pMain = try (pHeading)
+       <|> (try (pPara) 
+       <|> pSpace 
+       <|> try(pBold) 
+       <|> try(pEmph) 
+       <|> try (pLinkLong)
+       <|> 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 '>' = True
-validChar '/' = True
-validChar '\\' = True
-validChar '|' = True
-validChar _ = False
-
 
 newtype PGB = PGB DBService
 
@@ -124,7 +141,11 @@ instance Backend PGB where
                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 ""
+       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++"'"