X-Git-Url: https://ruin.nu/git/?p=yawbih.git;a=blobdiff_plain;f=Wiki.hs;h=ab89fff9de0e8c6a9a6e6bd834b67fd589d26c81;hp=d6ece0dc5f4d94829dd09bfd86f657be3927f781;hb=69ecfedf2b7e27f50f7c2cedf534a036fe16907e;hpb=a3c05f5d3f4be5f28a3eae7739f138a07fa263ad

diff --git a/Wiki.hs b/Wiki.hs
index d6ece0d..ab89fff 100644
--- a/Wiki.hs
+++ b/Wiki.hs
@@ -2,11 +2,15 @@ module Wiki (
 	Backend (getCurrent,getList,get,setCurrent,update)
 	,PGB
 	,createPGB
+	,Markup (Text, Paragraph, Link)
+	,Document
+	,wikiParser
 
 ) where
 
 import Dbconnect
 import Data.Char
+import Text.ParserCombinators.Parsec
 
 class Backend a where
 	--Keyword -> (Full text,date)
@@ -25,11 +29,44 @@ class Backend a where
 	update :: a -> String -> String -> String -> String -> IO String
 
 data Markup = Text String
-	| Bold String
-	| Paragraph [Markup]
+	| Paragraph 
+	| Link String String
 
 type Document = [Markup]
 
+wikiParser :: GenParser Char st Document	
+wikiParser = do 
+	s <- (try (pPara) 
+		<|> pOneEol 
+		<|> pLinkLong
+		<|> pText)
+	ss <- (wikiParser <|> return [])
+	return (s:ss)
+
+pPara = do
+	pEol
+	pEol
+	return (Paragraph)
+
+pOneEol = do
+	pEol
+	return (Text " ")
+
+pEol = char '\n' <|> do
+	char '\r'
+	char '\n'
+
+pLinkLong = do
+	string "[["
+	l <- many1 $ noneOf ['|','[',']']
+	char '|'
+	d <- many1 $ noneOf ['|','[',']'] 
+	string "]]"
+	return (Link l d)
+pText = do
+	t <- many1 (noneOf ['\n','\r','[',']'])
+	return (Text t)
+
 newtype PGB = PGB DBService
 
 createPGB :: String -> String -> String -> String -> IO PGB