More cleanup

diff --git a/Wiki.hs b/Wiki.hs
index a2b6548509f8282f73af4d2059216c4b91c23673..83b14b6223ceb7d7e7e59d7c6db4f6592d1bdbf2 100644 (file)
--- a/Wiki.hs
+++ b/Wiki.hs
@@ -56,7 +56,6 @@ pPara = do
        pEol
        return (Paragraph)
 
-
 pSpace = do
        space 
        return (Text " ")
@@ -92,17 +91,9 @@ pS s f = do
        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
@@ -140,18 +131,14 @@ pOtherChar = do
        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