wikiParser :: GenParser Char st Document
wikiParser = do
s <- (try (pPara)
- <|> pOneEol
+ <|> pSpace
<|> try (pLinkLong)
- <|> pLink
+ <|> try (pLink)
+ <|> pOtherChar
<|> pText)
ss <- (wikiParser <|> return [])
return (s:ss)
pEol
return (Paragraph)
-pOneEol = do
- pEol
+
+pSpace = do
+ space
return (Text " ")
pEol = char '\n' <|> do
pLinkLong = do
string "[["
- l <- many1 $ noneOf ['|','[',']']
+ l <- many1 $ noneOf ['|']
char '|'
- d <- many1 $ noneOf ['|','[',']']
+ d <- many1 $ noneOf [']']
string "]]"
return (Link l d)
pLink = do
l <- many1 $ noneOf ['|','[',']']
string "]]"
return (Link l l)
+pOtherChar = do
+ c <- satisfy validChar
+ return (Text (c:[]))
pText = do
- t <- many1 (noneOf ['\n','\r','[',']'])
+ 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 _ = False
+
+
newtype PGB = PGB DBService
createPGB :: String -> String -> String -> String -> IO PGB