pre

[yawbih.git] / Wiki.hs

diff --git a/Wiki.hs b/Wiki.hs
index 59e592938df2e7fbb25634bb30b65dd357f05735..9db2541a9dcff880b840770e91d9db40a5b2a020 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, Bold, Emph, Heading, Url)
+       ,Markup (Text, Paragraph, Link, Bold, Emph, Heading, Url, Underline, Strike, Pre)
        ,Document
        ,wikiParser
 
@@ -35,6 +35,9 @@ data Markup = Text String
        | Emph [Markup]
        | Heading Int [Markup]
        | Url String
+       | Underline [Markup]
+       | Strike [Markup]
+       | Pre String
 
 type Document = [Markup]
 
@@ -58,41 +61,50 @@ 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)
-
-pBold = do
-       string "**"
-       s <- pStringParser "**"
-       return (Bold s)
-
-pEmph = do
-       string "//"
-       s <- pStringParser "//"
-       return (Emph s)
-
-pStringParser xs = do 
+       (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 <- pStringParser xs
+               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 <- pStringParser (' ':level)
+       s <- pStopAt (' ':level)
        return (Heading (length level) s)
 
 pURL = do
@@ -100,13 +112,20 @@ 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 (pLinkLong)
+       <|> try(pUnderline) 
+       <|> try(pStrike) 
        <|> try (pLink)
        <|> try (pURL)
        <|> pOtherChar
@@ -139,7 +158,9 @@ 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
+               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