X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=Wiki.hs;h=94f4a5f433000c2a86cbd8eb19cc7ca1f8dffb8d;hb=625a2981711271d1f5841c55978d69881d6054da;hp=83b14b6223ceb7d7e7e59d7c6db4f6592d1bdbf2;hpb=da6b71a772c66eb03c9ced7a6ca0cbbd49013536;p=yawbih.git

diff --git a/Wiki.hs b/Wiki.hs
index 83b14b6..94f4a5f 100644
--- a/Wiki.hs
+++ b/Wiki.hs
@@ -2,7 +2,8 @@ module Wiki (
 	Backend (getCurrent,getList,get,setCurrent,update,listKeys)
 	,PGB
 	,createPGB
-	,Markup (Text, Paragraph, Link, Bold, Emph, Heading, Url, Underline, Strike, Pre)
+	,Markup (Text, Paragraph, Font, Link, Heading, Url, Pre,List)
+	,FontOp (Bold, Emph, Mono, Underline, Strike)
 	,Document
 	,wikiParser
 	,htmlOutput
@@ -35,105 +36,150 @@ class Backend a where
 data Markup = Text String
 	| Paragraph 
 	| Link String String
-	| Bold [Markup]
-	| Emph [Markup]
+	| Font FontOp [Markup]
 	| Heading Int [Markup]
 	| Url String
-	| Underline [Markup]
-	| Strike [Markup]
-	| Pre String
+	| Pre [Markup]
+	| List Bool [[Markup]]
 
-type Document = [Markup]
-
-wikiParser :: GenParser Char st Document	
-wikiParser = do 
-	s <- pMain
-	ss <- (wikiParser <|> return [])
-	return (s:ss)
+data FontOp = Bold | Emph | Mono | Underline | Strike
 
-pPara = do
-	pEol
-	pEol
-	return (Paragraph)
+type Document = [Markup]
 
-pSpace = do
-	space 
-	return (Text " ")
+wikiParser :: Parser Document	
+wikiParser = many1 pMain
 
-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))
+pPara :: Parser Markup	
+pPara = count 2 pEol >> return (Paragraph)
 
+pLink :: Parser 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)
+pList :: Bool -> Parser Markup
+pList enum = do
+	list <- many1 $ try $ pListItem enum
+	return (List enum list)
 
-pS s f = do
-	string s
-	s <- pStopAt s
-	return (f s)
+pListItem :: Bool -> Parser [Markup]
+pListItem enum = do
+	many1 pEol
+	char $ listToken enum
+	many pOneLine
 
-pStopAt xs = pUntil pMain xs
-pString xs = pUntil anyChar xs
-pUntil p xs = manyTill p (try $ string xs)
+listToken True = '#'
+listToken False = '*'
 	
+pHeading :: Parser Markup	
 pHeading = do
 	many1 pEol
 	level <- many1 $ char '='
-	char ' '
-	s <- pStopAt (' ':level)
+	s <- pStopAt level
 	return (Heading (length level) s)
 
+pURL :: Parser Markup	
 pURL = do
 	proto <- many1 letter
 	string "://"
-	s <- many1 (alphaNum <|> oneOf "?.:&-/")
+	s <- many1 (alphaNum <|> oneOf "?.:&-/~%=\\_")
 	return (Url (proto++"://"++s))
 
-pPre = do
-	string "<pre>"
-	s <- pString "</pre>"
-	return (Pre s)
+pMail :: Parser Markup
+pMail = do
+	user <- many1 (alphaNum <|> oneOf ".-_")
+	char '@'
+	server <- many1 (alphaNum <|> oneOf ".-_")
+	return (Url ("mailto:"++user++"@"++server))
 	
-pMain = try (pHeading)
-	<|> (try (pPara) 
-	<|> pSpace 
-	<|> try(pPre) 
-	<|> try(pBold) 
-	<|> try(pEmph) 
-	<|> try(pUnderline) 
-	<|> try(pStrike) 
-	<|> try (pLink)
-	<|> try (pURL)
-	<|> pOtherChar
-	<|> pText)	
 
+pPre :: Parser Markup	
+pPre = string "<pre>" >> do
+	s <- pUntil (pOneLine <|> pEol) "</pre>"
+	return (Pre s)
+
+pBold,pEmph,pUnderline,pStrike :: Parser Markup	
+pBold = pFont "**" Bold
+pEmph = pFont "//" Emph
+pUnderline = pFont "__" Underline
+pStrike = pFont "--" Strike
+pMono = pFont "||" Mono
+
+pFont s o = string s >> do
+	s <- pStopAt s
+	return (Font o s)
+
+pOtherChar :: Parser Markup	
 pOtherChar = do
-	c <- oneOf "*,;.:!?[]()'\"=-%$£<>/\\|"
+	c <- noneOf "\n\r"
 	return (Text (c:[]))
 
+pText :: Parser Markup	
 pText = do
 	t <- many1 alphaNum
 	return (Text t)
 
+pLinkContent :: Parser (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 -> Parser Document	
+pStopAt xs = pUntil pOneLine xs
+
+pString :: String -> Parser String	
+pString xs = pUntil anyChar xs
+
+pEol :: Parser Markup	
+pEol = do
+	(string "\n" <|> string "\r\n")
+	return (Text "\r\n")
+
+pUntil :: Parser a -> String -> Parser [a]	
+pUntil p xs = manyTill p (try $ string xs)
+	
+pMain :: Parser Markup	
+pMain = choice [
+	try (pHeading)
+	,try $ pList True
+	,try $ pList False
+	,try (pPara) 
+	,try(pPre) 
+	,try(pBold) 
+	,try(pEmph) 
+	,try(pUnderline) 
+	,try(pStrike) 
+	,try(pMono) 
+	,try (pLink)
+	,try (pURL)
+	,try (pMail)
+	,pText
+	,pOtherChar
+	,pEol
+	]
+
+pOneLine = choice [
+	try pBold
+	,try pEmph
+	,try pUnderline
+	,try pStrike
+	,try pMono
+	,try pLink
+	,try pURL
+	,try pMail
+	,pText
+	,pOtherChar
+	]
+
 newtype PGB = PGB DBService
 
 createPGB :: String -> String -> String -> String -> IO PGB
@@ -183,12 +229,10 @@ instance Backend PGB where
 				return id
 
 	listKeys (PGB db) = do
-		list <- selectReturnTuples db $ "SELECT keyword FROM fulltexts GROUP BY keyword 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++"'"
@@ -198,17 +242,21 @@ toHtml [] = []
 toHtml ((Paragraph):xs) = "<p>\n"++toHtml xs
 toHtml ((Text s):xs) = s++toHtml xs
 toHtml ((Link l d):xs) = "<link: "++l++" desc: "++d++">"++toHtml xs
-toHtml ((Bold d):xs) = "<b>"++toHtml d++"</b>"++toHtml xs
-toHtml ((Emph d):xs) = "<em>"++toHtml d++"</em>"++toHtml xs
-toHtml ((Underline d):xs) = "<u>"++toHtml d++"</u>"++toHtml xs
-toHtml ((Strike d):xs) = "<strike>"++toHtml d++"</strike>"++toHtml xs
+toHtml ((Font o d):xs) = "<"++fontOp o++">"++toHtml d++"</"++fontOp o++">"++toHtml xs
 toHtml ((Heading n d):xs) = "\n<h"++show n++">"++toHtml d++"</h"++show n++">\n"++toHtml xs
 toHtml ((Url l):xs) = "<link: "++l++">"++toHtml xs
-toHtml ((Pre s):xs) = "<pre>"++s++"</pre>"++toHtml xs
+toHtml ((Pre s):xs) = "<pre>"++toHtml s++"</pre>"++toHtml xs
+toHtml ((List o l):xs) = "<"++listType o++">\n"++(unlines $ map (\s -> "<li>"++toHtml s++"</li>\n") l) ++ "</"++listType o++">"++toHtml xs
+
+listType True = "ol"
+listType False = "ul"
 
+fontOp Bold = "b"
+fontOp Emph = "em"
+fontOp Mono = "tt"
+fontOp Underline = "u"
+fontOp Strike = "strike"
 
 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