Added lists and mail links + some parser cleanup

diff --git a/Main.hs b/Main.hs
index 4e9572cbaf0b246a96667069a304dab7c6acf549..3c634d36796ec7e71fb86a52138c7974d4b26acd 100644 (file)
--- a/Main.hs
+++ b/Main.hs
@@ -10,8 +10,13 @@ import Control.Monad
 
 import Text.ParserCombinators.Parsec
 
 
 import Text.ParserCombinators.Parsec
 

-testDB = createPGB "wave" "wiki" "wiki" "12wiki34db"
+testDB = createPGB "localhost" "wiki" "wiki" "12wiki34db"

 
 

+test key = do
+       db <- testDB
+       s <- getCurrent db key 
+       print s
+       

 --main = start [] cgi
 
 main = do 
 --main = start [] cgi
 
 main = do 


@@ -139,11 +144,17 @@ toWash ((Heading n d):xs) = do
        heading n $ toWash d
        toWash xs
 toWash ((Url l):xs) = do
        heading n $ toWash d
        toWash xs
 toWash ((Url l):xs) = do

-       hlink (URL {unURL = (l)}) (text l)
+       hlink (URL {unURL = (l)}) (text $ stripMailto l)

        toWash xs
 toWash ((Pre s):xs) = do
        pre $ text s
        toWash xs
        toWash xs
 toWash ((Pre s):xs) = do
        pre $ text s
        toWash xs

+toWash ((List l):xs) = do
+       ul $ mapM (\s -> li $ toWash s) l
+       toWash xs
+
+stripMailto ('m':'a':'i':'l':'t':'o':':':xs) = xs
+stripMailto xs = xs

 
 heading 1 = h1
 heading 2 = h2
 
 heading 1 = h1
 heading 2 = h2

diff --git a/Wiki.hs b/Wiki.hs
index 37b43112fd856a35736c9b5dcd21aa9cd0fd0f92..1371c453e597351ede57c674fb807afb993ecd5b 100644 (file)
--- a/Wiki.hs
+++ b/Wiki.hs
@@ -2,7 +2,7 @@ module Wiki (
        Backend (getCurrent,getList,get,setCurrent,update,listKeys)
        ,PGB
        ,createPGB
        Backend (getCurrent,getList,get,setCurrent,update,listKeys)
        ,PGB
        ,createPGB

-       ,Markup (Text, Paragraph, Link, Bold, Emph, Heading, Url, Underline, Strike, Pre)
+       ,Markup (Text, Paragraph, Link, Bold, Emph, Heading, Url, Underline, Strike, Pre,List)

        ,Document
        ,wikiParser
        ,htmlOutput
        ,Document
        ,wikiParser
        ,htmlOutput


@@ -42,6 +42,7 @@ data Markup = Text String
        | Underline [Markup]
        | Strike [Markup]
        | Pre String
        | Underline [Markup]
        | Strike [Markup]
        | Pre String

+       | List [[Markup]]

 
 type Document = [Markup]
 
 
 type Document = [Markup]
 


@@ -51,11 +52,6 @@ wikiParser = many1 pMain
 pPara :: GenParser Char st Markup      
 pPara = count 2 pEol >> return (Paragraph)
 
 pPara :: GenParser Char st Markup      
 pPara = count 2 pEol >> return (Paragraph)
 

-pSpace :: GenParser Char st Markup     
-pSpace = do
-       c <- space 
-       return (Text (c:[]))
-

 pLink :: GenParser Char st Markup      
 pLink = do
        string "[["
 pLink :: GenParser Char st Markup      
 pLink = do
        string "[["


@@ -64,6 +60,17 @@ pLink = do
                [] -> return (Link l l)
                _ -> return (Link l d)
 
                [] -> return (Link l l)
                _ -> return (Link l d)
 

+pList :: GenParser Char st Markup
+pList = do
+       list <- many1 $ try pListItem 
+       return (List list)
+
+pListItem :: GenParser Char st [Markup]
+pListItem = do
+       many1 pEol
+       char '*'
+       many pOneLine
+       

 pHeading :: GenParser Char st Markup   
 pHeading = do
        many1 pEol
 pHeading :: GenParser Char st Markup   
 pHeading = do
        many1 pEol


@@ -79,6 +86,14 @@ pURL = do
        s <- many1 (alphaNum <|> oneOf "?.:&-/")
        return (Url (proto++"://"++s))
 
        s <- many1 (alphaNum <|> oneOf "?.:&-/")
        return (Url (proto++"://"++s))
 

+pMail :: GenParser Char st Markup
+pMail = do
+       user <- many1 (alphaNum <|> oneOf ".-_")
+       char '@'
+       server <- many1 (alphaNum <|> oneOf ".-_")
+       return (Url ("mailto:"++user++"@"++server))
+       
+

 pPre :: GenParser Char st Markup       
 pPre = string "<pre>" >> do
        s <- pString "</pre>"
 pPre :: GenParser Char st Markup       
 pPre = string "<pre>" >> do
        s <- pString "</pre>"


@@ -95,7 +110,7 @@ pS s f = string s >> do
 
 pOtherChar :: GenParser Char st Markup 
 pOtherChar = do
 
 pOtherChar :: GenParser Char st Markup 
 pOtherChar = do

-       c <- oneOf "*,;.:!?[]()'\"=-%$£<>/\\|"
+       c <- noneOf "\n\r"

        return (Text (c:[]))
 
 pText :: GenParser Char st Markup      
        return (Text (c:[]))
 
 pText :: GenParser Char st Markup      


@@ -115,13 +130,15 @@ pLinkContent = do try (string "]]" >> return ([],[]))
                return (c:l,d))
 
 pStopAt :: String -> GenParser Char st Document        
                return (c:l,d))
 
 pStopAt :: String -> GenParser Char st Document        

-pStopAt xs = pUntil pMain xs
+pStopAt xs = pUntil pOneLine xs

 
 pString :: String -> GenParser Char st String  
 pString xs = pUntil anyChar xs
 
 
 pString :: String -> GenParser Char st String  
 pString xs = pUntil anyChar xs
 

-pEol :: GenParser Char st String       
-pEol = string "\n" <|> string "\r\n"
+pEol :: GenParser Char st Markup       
+pEol = do
+       (string "\n" <|> string "\r\n")
+       return (Text "\r\n")

 
 pUntil :: GenParser Char st a -> String -> GenParser Char st [a]       
 pUntil p xs = manyTill p (try $ string xs)
 
 pUntil :: GenParser Char st a -> String -> GenParser Char st [a]       
 pUntil p xs = manyTill p (try $ string xs)


@@ -129,8 +146,8 @@ pUntil p xs = manyTill p (try $ string xs)
 pMain :: GenParser Char st Markup      
 pMain = choice [
        try (pHeading)
 pMain :: GenParser Char st Markup      
 pMain = choice [
        try (pHeading)

+       ,try pList

        ,try (pPara) 
        ,try (pPara) 

-       ,pSpace 

        ,try(pPre) 
        ,try(pBold) 
        ,try(pEmph) 
        ,try(pPre) 
        ,try(pBold) 
        ,try(pEmph) 


@@ -138,8 +155,22 @@ pMain = choice [
        ,try(pStrike) 
        ,try (pLink)
        ,try (pURL)
        ,try(pStrike) 
        ,try (pLink)
        ,try (pURL)

+       ,try (pMail)
+       ,pText

        ,pOtherChar
        ,pOtherChar

+       ,pEol
+       ]
+
+pOneLine = choice [
+       try pBold
+       ,try pEmph
+       ,try pUnderline
+       ,try pStrike
+       ,try pLink
+       ,try pURL
+       ,try pMail

        ,pText
        ,pText

+       ,pOtherChar

        ]
 
 newtype PGB = PGB DBService
        ]
 
 newtype PGB = PGB DBService


@@ -211,6 +242,7 @@ 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
 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

+toHtml ((List l):xs) = "<ul>\n"++(unlines $ map (\s -> "<li>"++toHtml s++"</li>\n") l) ++ "</ul>"++toHtml xs

 
 htmlOutput s = case parse wikiParser "" s of
                                        Right n -> putStr (toHtml n)
 
 htmlOutput s = case parse wikiParser "" s of
                                        Right n -> putStr (toHtml n)