more cleanup

[yawbih.git] / Wiki.hs

diff --git a/Wiki.hs b/Wiki.hs
index 231dda46217123dc1cee063d5dbc150a1c8f4f1f..37b43112fd856a35736c9b5dcd21aa9cd0fd0f92 100644 (file)
--- a/Wiki.hs
+++ b/Wiki.hs
@@ -46,64 +46,25 @@ data Markup = Text String
 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 = many1 pMain
 
+pPara :: GenParser Char st Markup      
+pPara = count 2 pEol >> return (Paragraph)
 
+pSpace :: GenParser Char st Markup     
 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))
+       c <- space 
+       return (Text (c:[]))
 
+pLink :: GenParser Char st 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)
-
-pS s f = do
-       string s
-       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))
-       
+pHeading :: GenParser Char st Markup   
 pHeading = do
        many1 pEol
        level <- many1 $ char '='
@@ -111,47 +72,81 @@ pHeading = do
        s <- pStopAt (' ':level)
        return (Heading (length level) s)
 
+pURL :: GenParser Char st Markup       
 pURL = do
        proto <- many1 letter
        string "://"
        s <- many1 (alphaNum <|> oneOf "?.:&-/")
        return (Url (proto++"://"++s))
 
-pPre = do
-       string "<pre>"
+pPre :: GenParser Char st Markup       
+pPre = string "<pre>" >> do
        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)      
 
+pBold,pEmph,pUnderline,pStrike :: GenParser Char st 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 :: GenParser Char st Markup 
 pOtherChar = do
        c <- oneOf "*,;.:!?[]()'\"=-%$£<>/\\|"
        return (Text (c:[]))
 
+pText :: GenParser Char st Markup      
 pText = do
-       t <- many1 alphaNum--(noneOf ['\n','\r','[',']'])
+       t <- many1 alphaNum
        return (Text t)
 
+pLinkContent :: GenParser Char st (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 -> GenParser Char st Document        
+pStopAt xs = pUntil pMain xs
+
+pString :: String -> GenParser Char st String  
+pString xs = pUntil anyChar xs
+
+pEol :: GenParser Char st String       
+pEol = string "\n" <|> string "\r\n"
+
+pUntil :: GenParser Char st a -> String -> GenParser Char st [a]       
+pUntil p xs = manyTill p (try $ string xs)
+       
+pMain :: GenParser Char st Markup      
+pMain = choice [
+       try (pHeading)
+       ,try (pPara) 
+       ,pSpace 
+       ,try(pPre) 
+       ,try(pBold) 
+       ,try(pEmph) 
+       ,try(pUnderline) 
+       ,try(pStrike) 
+       ,try (pLink)
+       ,try (pURL)
+       ,pOtherChar
+       ,pText
+       ]
 
 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 
@@ -196,12 +191,10 @@ instance Backend PGB where
                                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
-               
-                       
 
 tov :: String -> String
 tov s = '\'':escapeQuery s++"'"
@@ -219,9 +212,6 @@ toHtml ((Heading n d):xs) = "\n<h"++show n++">"++toHtml d++"</h"++show n++">\n"+
 toHtml ((Url l):xs) = "<link: "++l++">"++toHtml xs
 toHtml ((Pre s):xs) = "<pre>"++s++"</pre>"++toHtml xs
 
-
 htmlOutput s = case parse wikiParser "" s of
-                                       Right n -> do 
-                                               putStr (toHtml n)
-                                       Left e -> do
-                                               print e
+                                       Right n -> putStr (toHtml n)
+                                       Left e -> print e