module Wiki (
- Backend (getCurrent,getList,get,setCurrent,update)
+ 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
) 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
| Url String
| Underline [Markup]
| Strike [Markup]
- | Pre String
+ | Pre [Markup]
+ | List Bool [[Markup]]
type Document = [Markup]
-wikiParser :: GenParser Char st Document
-wikiParser = do
- s <- pMain
- ss <- (wikiParser <|> return [])
- return (s:ss)
-
-pPara = do
- pEol
- pEol
- return (Paragraph)
-
+wikiParser :: Parser Document
+wikiParser = many1 pMain
-pSpace = do
- space
- return (Text " ")
-
-pEol = char '\n' <|> do
- char '\r'
- char '\n'
-
-pLinkParser = do try (string "]]" >> return ([],[]))
- <|> try (do
- string " | "
- d <- pString "]]"
- return ([],d))
- <|> (do
- c <- anyChar
- (l,d) <- pLinkParser
- return (c:l,d))
+pPara :: Parser Markup
+pPara = count 2 pEol >> return (Paragraph)
+pLink :: Parser Markup
pLink = do
string "[["
- (l,d) <- pLinkParser
+ (l,d) <- pLinkContent
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)
+pList :: Bool -> Parser Markup
+pList enum = do
+ list <- many1 $ try $ pListItem enum
+ return (List enum list)
-pS s f = do
- string s
- s <- pStopAt s
- return (f s)
+pListItem :: Bool -> Parser [Markup]
+pListItem enum = do
+ many1 pEol
+ char $ listToken enum
+ many pOneLine
-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))
+listToken True = '#'
+listToken False = '*'
+pHeading :: Parser Markup
pHeading = do
many1 pEol
level <- many1 $ char '='
- char ' '
- s <- pStopAt (' ':level)
+ s <- pStopAt level
return (Heading (length level) s)
+pURL :: Parser Markup
pURL = do
proto <- many1 letter
string "://"
- s <- many1 (alphaNum <|> oneOf "?.:&-/")
+ s <- many1 (alphaNum <|> oneOf "?.:&-/~%=\\_")
return (Url (proto++"://"++s))
-pPre = do
- string "<pre>"
- s <- pString "</pre>"
- return (Pre s)
+pMail :: Parser Markup
+pMail = do
+ user <- many1 (alphaNum <|> oneOf ".-_")
+ char '@'
+ server <- many1 (alphaNum <|> oneOf ".-_")
+ return (Url ("mailto:"++user++"@"++server))
-pMain = try (pHeading)
- <|> (try (pPara)
- <|> pSpace
- <|> try(pPre)
- <|> try(pBold)
- <|> try(pEmph)
- <|> try(pUnderline)
- <|> try(pStrike)
- <|> try (pLink)
- <|> try (pURL)
- <|> pOtherChar
- <|> pText)
+pPre :: Parser Markup
+pPre = string "<pre>" >> do
+ s <- pUntil (pOneLine <|> pEol) "</pre>"
+ return (Pre s)
+
+pBold,pEmph,pUnderline,pStrike :: Parser Markup
+pBold = pS "**" (\s -> Bold s)
+pEmph = pS "//" (\s -> Emph s)
+pUnderline = pS "__" (\s -> Underline s)
+pStrike = pS "--" (\s -> Strike s)
+pS s f = string s >> do
+ s <- pStopAt s
+ return (f s)
+
+pOtherChar :: Parser Markup
pOtherChar = do
- c <- oneOf "*,;.:!?[]()'\"=-%$£<>/\\|"
+ c <- noneOf "\n\r"
return (Text (c:[]))
+pText :: Parser Markup
pText = do
- t <- many1 alphaNum--(noneOf ['\n','\r','[',']'])
+ t <- many1 alphaNum
return (Text t)
+pLinkContent :: Parser (String, String)
+pLinkContent = do try (string "]]" >> return ([],[]))
+ <|> try (do
+ string " | "
+ d <- pString "]]"
+ return ([],d))
+ <|> (do
+ c <- anyChar
+ (l,d) <- pLinkContent
+ return (c:l,d))
+
+pStopAt :: String -> Parser Document
+pStopAt xs = pUntil pOneLine xs
+
+pString :: String -> Parser String
+pString xs = pUntil anyChar xs
+
+pEol :: Parser Markup
+pEol = do
+ (string "\n" <|> string "\r\n")
+ return (Text "\r\n")
+
+pUntil :: Parser a -> String -> Parser [a]
+pUntil p xs = manyTill p (try $ string xs)
+
+pMain :: Parser Markup
+pMain = choice [
+ try (pHeading)
+ ,try $ pList True
+ ,try $ pList False
+ ,try (pPara)
+ ,try(pPre)
+ ,try(pBold)
+ ,try(pEmph)
+ ,try(pUnderline)
+ ,try(pStrike)
+ ,try (pLink)
+ ,try (pURL)
+ ,try (pMail)
+ ,pText
+ ,pOtherChar
+ ,pEol
+ ]
+
+pOneLine = choice [
+ try pBold
+ ,try pEmph
+ ,try pUnderline
+ ,try pStrike
+ ,try pLink
+ ,try pURL
+ ,try pMail
+ ,pText
+ ,pOtherChar
+ ]
newtype PGB = PGB DBService
createPGB :: String -> String -> String -> String -> IO PGB
createPGB host database user password = let db = createDBService host database "" user password Nothing in return (PGB db)
-
-testDB = createPGB "wave" "wiki" "wiki" "12wiki34db"
-
instance Backend PGB where
getCurrent (PGB db) key = do
[[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 current 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>"++toHtml s++"</pre>"++toHtml xs
+toHtml ((List o l):xs) = "<"++listType o++">\n"++(unlines $ map (\s -> "<li>"++toHtml s++"</li>\n") l) ++ "</"++listType o++">"++toHtml xs
+
+listType True = "ol"
+listType False = "ul"
+
+htmlOutput s = case parse wikiParser "" s of
+ Right n -> putStr (toHtml n)
+ Left e -> print e
projects / yawbih.git / blobdiff