X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=Wiki.hs;h=a2d2ff220b019e2b2b02d791da408f1300938a50;hb=6bb9a6da06d8911d0fc2dd821705323fa3beb0dc;hp=59e592938df2e7fbb25634bb30b65dd357f05735;hpb=ee02e144cc032d02afc0aaf3b1e73a1a68963ac6;p=yawbih.git

diff --git a/Wiki.hs b/Wiki.hs
index 59e5929..a2d2ff2 100644
--- a/Wiki.hs
+++ b/Wiki.hs
@@ -1,10 +1,11 @@
 module Wiki (
-	Backend (getCurrent,getList,get,setCurrent,update)
+	Backend (getCurrent,getList,get,setCurrent,update,listKeys)
 	,PGB
 	,createPGB
-	,Markup (Text, Paragraph, Link, Bold, Emph, Heading, Url)
+	,Markup (Text, Paragraph, Link, Bold, Emph, Heading, Url, Underline, Strike, Pre)
 	,Document
 	,wikiParser
+	,htmlOutput
 
 ) where
 
@@ -28,6 +29,9 @@ class Backend a where
 	--Keyword -> Full text -> id
 	update :: a -> String -> String -> String -> String -> IO String
 
+	--[Keyword]
+	listKeys :: a -> IO [String]
+
 data Markup = Text String
 	| Paragraph 
 	| Link String String
@@ -35,64 +39,64 @@ data Markup = Text String
 	| Emph [Markup]
 	| Heading Int [Markup]
 	| Url String
+	| Underline [Markup]
+	| Strike [Markup]
+	| Pre String
 
 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'
 	char '\n'
 
-pLinkLong = do
-	string "[["
-	l <- many1 $ noneOf ['|']
-	char '|'
-	d <- many1 $ noneOf "]" 
-	string "]]"
-	return (Link l d)
+pLinkParser = do try (string "]]" >> return ([],[])) 
+	<|> try (do
+		string " | "
+		d <- pString "]]"
+		return ([],d))
+	<|> (do
+		c <- anyChar
+		(l,d) <- pLinkParser
+		return (c:l,d))
 
 pLink = do
 	string "[["
-	l <- many1 $ noneOf "]"
-	string "]]"
-	return (Link l l)
-
-pBold = do
-	string "**"
-	s <- pStringParser "**"
-	return (Bold s)
-
-pEmph = do
-	string "//"
-	s <- pStringParser "//"
-	return (Emph s)
-
-pStringParser xs = do 
-	try (string xs >> return []) <|> (do
-		s <- pMain 
-		ss <- pStringParser xs
-		return (s:ss))
-
+	(l,d) <- pLinkParser
+	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 = do
 	many1 pEol
 	level <- many1 $ char '='
 	char ' '
-	s <- pStringParser (' ':level)
+	s <- pStopAt (' ':level)
 	return (Heading (length level) s)
 
 pURL = do
@@ -100,35 +104,40 @@ pURL = do
 	string "://"
 	s <- many1 (alphaNum <|> oneOf "?.:&-/")
 	return (Url (proto++"://"++s))
+
+pPre = do
+	string "<pre>"
+	s <- pString "</pre>"
+	return (Pre s)
 	
-pMain = try (pHeading)
-	<|> (try (pPara) 
-	<|> pSpace 
-	<|> try(pBold) 
-	<|> try(pEmph) 
-	<|> try (pLinkLong)
-	<|> 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 
@@ -139,7 +148,9 @@ instance Backend PGB where
 
 	getList (PGB db) key = do
 		list <- selectReturnTuples db $ "SELECT id, timestamp, author, comment from fulltexts WHERE keyword = "++tov key
-		return $ map (\[id,date,author,comment] -> (id,date,author,comment)) list
+		case list of
+			[[]] -> return []
+			_ -> return $ map (\[id,date,author,comment] -> (id,date,author,comment)) list
 
 	get (PGB db) key id = do
 		list <- selectReturnTuples db $ "SELECT fulltext from fulltexts WHERE id = "++tov id	
@@ -169,9 +180,34 @@ instance Backend PGB where
 				[[id]] <- selectReturnTuples db $ "SELECT currval('fulltexts_id_seq')" 
 				setCurrent (PGB db) key id
 				return id
+
+	listKeys (PGB db) = do
+		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++"'"
 		
-
+toHtml :: [Markup] -> String
+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 ((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
+
+
+htmlOutput s = case parse wikiParser "" s of
+					Right n -> do 
+						putStr (toHtml n)
+					Left e -> do
+						print e