type Document = [Markup]
wikiParser :: GenParser Char st Document
-wikiParser = do
- s <- pMain
- ss <- (wikiParser <|> return [])
- return (s:ss)
+wikiParser = many1 pMain
pPara = do
pEol
pEol
return (Paragraph)
-
pSpace = do
- space
- return (Text " ")
+ c <- space
+ return (Text (c:[]))
pEol = char '\n' <|> do
char '\r'
s <- pStopAt s
return (f s)
-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))
+pStopAt xs = pUntil pMain xs
+pString xs = pUntil anyChar xs
+pUntil p xs = manyTill p (try $ string xs)
pHeading = do
many1 pEol
s <- pString "</pre>"
return (Pre s)
-pMain = try (pHeading)
- <|> (try (pPara)
- <|> pSpace
- <|> try(pPre)
- <|> try(pBold)
- <|> try(pEmph)
- <|> try(pUnderline)
- <|> try(pStrike)
- <|> try (pLink)
- <|> try (pURL)
- <|> pOtherChar
- <|> pText)
+pMain = choice [
+ try (pHeading)
+ ,try (pPara)
+ ,pSpace
+ ,try(pPre)
+ ,try(pBold)
+ ,try(pEmph)
+ ,try(pUnderline)
+ ,try(pStrike)
+ ,try (pLink)
+ ,try (pURL)
+ ,pOtherChar
+ ,pText
+ ]
pOtherChar = do
c <- oneOf "*,;.:!?[]()'\"=-%$£<>/\\|"
return (Text (c:[]))
pText = do
- t <- many1 alphaNum--(noneOf ['\n','\r','[',']'])
+ t <- many1 alphaNum
return (Text t)
-
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
return id
listKeys (PGB db) = do
- list <- selectReturnTuples db $ "SELECT keyword FROM fulltexts ORDER BY lower(keyword)"
+ list <- selectReturnTuples db $ "SELECT keyword FROM current keyword ORDER BY lower(keyword)"
case list of
[[]] -> return []
_ -> mapM (\[key] -> return key) list