more robust link parsing

[yawbih.git] / Wiki.hs

diff --git a/Wiki.hs b/Wiki.hs
index 0b9e337da4bd7e50f7ebb266c88ca2d9c7bf6c28..83827cc1a6e6fbb9e04059f91350b99a0ae824cd 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)
+       ,Markup (Text, Paragraph, Link, Bold, Emph, Heading, Url, Underline, Strike)
        ,Document
        ,wikiParser
 
@@ -32,17 +32,17 @@ data Markup = Text String
        | Paragraph 
        | Link String String
        | Bold [Markup]
+       | Emph [Markup]
+       | Heading Int [Markup]
+       | Url String
+       | Underline [Markup]
+       | Strike [Markup]
 
 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)
 
@@ -60,26 +60,82 @@ pEol = char '\n' <|> do
        char '\r'
        char '\n'
 
-pLinkLong = do
+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 ['|']
-       char '|'
-       d <- many1 $ noneOf "]" 
-       string "]]"
-       return (Link l d)
+       (l,d) <- pLinkParser
+       case d of
+               [] -> return (Link l l)
+               _ -> return (Link l d)
 
 pBold = do
-       string "'''"
-       s <- wikiParser
+       string "**"
+       s <- pStringParser "**"
        return (Bold s)
 
-pLink = do
-       string "[["
-       l <- many1 $ noneOf "]"
-       string "]]"
-       return (Link l l)
+pEmph = do
+       string "//"
+       s <- pStringParser "//"
+       return (Emph s)
+
+pUnderline = do
+       string "__"
+       s <- pStringParser "__"
+       return (Underline s)
+
+pStrike = do
+       string "--"
+       s <- pStringParser "--"
+       return (Strike s)
+
+pStringParser xs = do 
+       try (string xs >> return []) <|> (do
+               s <- pMain 
+               ss <- pStringParser 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)
+       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(pUnderline) 
+       <|> try(pStrike) 
+       <|> try (pLink)
+       <|> try (pURL)
+       <|> pOtherChar
+       <|> pText)      
+
 pOtherChar = do
-       c <- oneOf ",;.:!?[]()\'\"=-%$£<>/\\|"
+       c <- oneOf "*,;.:!?[]()'\"=-%$£<>/\\|"
        return (Text (c:[]))
 
 pText = do
@@ -105,7 +161,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