X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=Wiki.hs;h=37b43112fd856a35736c9b5dcd21aa9cd0fd0f92;hb=01c59ac502d71c3c1ccac422b5665f9e5954a190;hp=f2a68f28e432b1f8005e7ebc31c2b1c4aab5a295;hpb=0faacae411100c8ba6606c22a453bff6a5517a11;p=yawbih.git

diff --git a/Wiki.hs b/Wiki.hs
index f2a68f2..37b4311 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)
+	,Markup (Text, Paragraph, Link, Bold, Emph, Heading, Url, Underline, Strike, Pre)
 	,Document
 	,wikiParser
+	,htmlOutput
 
 ) where
 
@@ -20,7 +21,7 @@ class Backend a where
 	getList :: a -> String -> IO [(String, String, String, String)]
 
 	--Keyword -> id -> Full text
-	get :: a -> String -> String -> IO String
+	get :: a -> String -> String -> IO (Maybe String)
 
 	--Keyword -> id -> ()
 	setCurrent :: a -> String -> String -> IO Bool
@@ -28,86 +29,124 @@ 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
+	| Bold [Markup]
+	| Emph [Markup]
+	| Heading Int [Markup]
+	| Url String
+	| Underline [Markup]
+	| Strike [Markup]
+	| Pre String
 
 type Document = [Markup]
 
 wikiParser :: GenParser Char st Document	
-wikiParser = do 
-	s <- (try (pPara) 
-		<|> pSpace 
-		<|> try (pLinkLong)
-		<|> try (pLink)
-		<|> pOtherChar
-		<|> pText)
-	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'
+	c <- space 
+	return (Text (c:[]))
 
-pLinkLong = do
-	string "[["
-	l <- many1 $ noneOf ['|']
-	char '|'
-	d <- many1 $ noneOf [']'] 
-	string "]]"
-	return (Link l d)
+pLink :: GenParser Char st Markup	
 pLink = do
 	string "[["
-	l <- many1 $ noneOf ['|','[',']']
-	string "]]"
-	return (Link l l)
+	(l,d) <- pLinkContent
+	case d of
+		[] -> return (Link l l)
+		_ -> return (Link l d)
+
+pHeading :: GenParser Char st Markup	
+pHeading = do
+	many1 pEol
+	level <- many1 $ char '='
+	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 :: 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 <- satisfy validChar
+	c <- oneOf "*,;.:!?[]()'\"=-%$£<>/\\|"
 	return (Text (c:[]))
 
+pText :: GenParser Char st Markup	
 pText = do
-	t <- many1 alphaNum--(noneOf ['\n','\r','[',']'])
+	t <- many1 alphaNum
 	return (Text t)
 
-validChar ',' = True
-validChar '.' = True
-validChar '!' = True
-validChar '?' = True
-validChar '[' = True
-validChar ']' = True
-validChar '\'' = True
-validChar '"' = True
-validChar '=' = True
-validChar '-' = True
-validChar '%' = True
-validChar '$' = True
-validChar '£' = True
-validChar '<' = True
-validChar '>' = True
-validChar '/' = True
-validChar '\\' = True
-validChar '|' = True
-validChar _ = False
-
+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 
@@ -118,9 +157,15 @@ 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
-
-	get (PGB db) key id = return ""
+		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	
+		case list of
+			[s]:_ -> return (Just s)
+			_ -> return Nothing
 
 	setCurrent (PGB db) key id = do
 		full <- selectReturnTuples db $ "SELECT keyword FROM fulltexts WHERE keyword="++tov key++" AND id='"++id++"'"
@@ -144,9 +189,29 @@ 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 -> putStr (toHtml n)
+					Left e -> print e