db <- testDB
runWithHook [] (\(key:act) -> showPage db (filter (/= '\\') key)) $ showPage db "MainPage"
-ps a = standardQuery "Hello" a
-
editPage db key = do
s <- io $ getCurrent db key
s' <- case s of
p empty
text "Comment: "
c <- textInputField (fieldSIZE 20)
- --p $ submit (F2 t a) testing (attr "value" "Send")
p $ defaultSubmit (F3 t a c) (savePage db key) (attr "value" "Send")
- --submit0 (sp db key []) (attr "value" "Send1")
-
savePage db key (F3 t a c) = do
io $ update db key fulltext author comment
wikiParser :: GenParser Char st Document
wikiParser = many1 pMain
-pPara = do
- pEol
- pEol
- return (Paragraph)
+pPara :: GenParser Char st Markup
+pPara = count 2 pEol >> return (Paragraph)
+pSpace :: GenParser Char st Markup
pSpace = do
c <- space
return (Text (c:[]))
-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))
-
+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 = pUntil pMain xs
-pString xs = pUntil anyChar xs
-pUntil p xs = manyTill p (try $ string xs)
-
+pHeading :: GenParser Char st Markup
pHeading = do
many1 pEol
level <- many1 $ char '='
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)
+
+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
+ 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)
,pText
]
-pOtherChar = do
- c <- oneOf "*,;.:!?[]()'\"=-%$£<>/\\|"
- return (Text (c:[]))
-
-pText = do
- t <- many1 alphaNum
- return (Text t)
-
newtype PGB = PGB DBService
createPGB :: String -> String -> String -> String -> IO PGB
case list of
[[]] -> return []
_ -> mapM (\[key] -> return key) list
-
-
tov :: String -> String
tov s = '\'':escapeQuery s++"'"
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