X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=Wiki.hs;h=2b8b31383779ae576115b14cdc106522b4bf99d1;hb=b0821b704ddf955948416ec8bfa0afcc6512c933;hp=d7ce7bcd912305223137ad8a72f141f255cfb165;hpb=4f0ceb93a3cf4cc64f0809445e3b05beffcaf8ce;p=yawbih.git

diff --git a/Wiki.hs b/Wiki.hs
index d7ce7bc..2b8b313 100644
--- a/Wiki.hs
+++ b/Wiki.hs
@@ -1,50 +1,255 @@
 module Wiki (
-	WB
+	Backend (getCurrent,getList,get,setCurrent,update,listKeys)
 	,PGB
+	,createPGB
+	,Markup (Text, Paragraph, Link, Bold, Emph, Heading, Url, Underline, Strike, Pre,List)
+	,Document
+	,wikiParser
+	,htmlOutput
 
 ) where
 
 import Dbconnect
 import Data.Char
+import Text.ParserCombinators.Parsec
 
-class WB a where
+class Backend a where
 	--Keyword -> (Full text,date)
-	getCurrent :: a -> String -> IO (String,String)
+	getCurrent :: a -> String -> IO (Maybe (String,String))
 
-	--Keyword -> [(id,date)]
+	--Keyword -> [(id,date,author,comment)]
 	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 Int
+	setCurrent :: a -> String -> String -> IO Bool
 
 	--Keyword -> Full text -> id
-	addNew :: a -> String -> String -> IO String
-
-data PGB = PGB DBService
+	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
+	| List Bool [[Markup]]
+
+type Document = [Markup]
+
+wikiParser :: Parser Document	
+wikiParser = many1 pMain
+
+pPara :: Parser Markup	
+pPara = count 2 pEol >> return (Paragraph)
+
+pLink :: Parser Markup	
+pLink = do
+	string "[["
+	(l,d) <- pLinkContent
+	case d of
+		[] -> return (Link l l)
+		_ -> return (Link l d)
+
+pList :: Bool -> Parser Markup
+pList enum = do
+	list <- many1 $ try $ pListItem enum
+	return (List enum list)
+
+pListItem :: Bool -> Parser [Markup]
+pListItem enum = do
+	many1 pEol
+	char $ listToken enum
+	many pOneLine
+
+listToken True = '#'
+listToken False = '*'
+	
+pHeading :: Parser Markup	
+pHeading = do
+	many1 pEol
+	level <- many1 $ char '='
+	s <- pStopAt level
+	return (Heading (length level) s)
+
+pURL :: Parser Markup	
+pURL = do
+	proto <- many1 letter
+	string "://"
+	s <- many1 (alphaNum <|> oneOf "?.:&-/")
+	return (Url (proto++"://"++s))
+
+pMail :: Parser Markup
+pMail = do
+	user <- many1 (alphaNum <|> oneOf ".-_")
+	char '@'
+	server <- many1 (alphaNum <|> oneOf ".-_")
+	return (Url ("mailto:"++user++"@"++server))
+	
+
+pPre :: Parser Markup	
+pPre = string "<pre>" >> do
+	s <- pString "</pre>"
+	return (Pre s)
+
+pBold,pEmph,pUnderline,pStrike :: Parser 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 :: Parser Markup	
+pOtherChar = do
+	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 (pLink)
+	,try (pURL)
+	,try (pMail)
+	,pText
+	,pOtherChar
+	,pEol
+	]
+
+pOneLine = choice [
+	try pBold
+	,try pEmph
+	,try pUnderline
+	,try pStrike
+	,try pLink
+	,try pURL
+	,try pMail
+	,pText
+	,pOtherChar
+	]
+
+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 WB PGB where
+instance Backend PGB where
 
 	getCurrent (PGB db) key = do 
-		[[text,date]] <- selectReturnTuples db $ "SELECT fulltext,timestamp FROM curtexts where keyword='"++(escapeQuery key)++"'"
-		return (text,date)
+		result <- selectReturnTuples db $ "SELECT fulltext,timestamp FROM curtexts WHERE keyword="++tov key
+		case result of
+			[text,date]:_ -> return (Just (text,date))
+			_ -> return Nothing
 
 	getList (PGB db) key = do
-		list <- selectReturnTuples db $ "SELECT id, timestamp, author, comment from fulltexts where keyword = '"++(escapeQuery key)++"'"
-		return $ map (\[id,date,author,comment] -> (id,date,author,comment)) list
-
-	get (PGB db) key id = return ""
-
-	setCurrent (PGB db) key id = 
-		execute db $ "UPDATE current SET id = '"++(escapeQuery id)++"' where keyword = '"++(escapeQuery key)++"'"
-
-	addNew (PGB db) key text = return ""
-
+		list <- selectReturnTuples db $ "SELECT id, timestamp, author, comment from fulltexts WHERE keyword = "++tov key
+		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++"'"
+		cur <- selectReturnTuples db $ "SELECT keyword FROM curtexts WHERE keyword="++tov key
+		case full of
+			[[]] -> do
+				return False
+			_  -> do
+				rows <- case cur of
+					[[]] -> do
+						execute db $ "INSERT INTO current (keyword, id) VALUES ("++tov key++","++tov id++")"
+					_  -> do
+						execute db $ "UPDATE current SET id = "++tov id++" WHERE keyword = "++tov key
+				if rows == 1 then return True
+					else return False 
+
+	update (PGB db) key text author comment = do
+		rows <- execute db $ "INSERT INTO fulltexts (keyword,fulltext, author, comment) VALUES ("++tov key++","++tov text++","++tov author++","++tov comment++")"
+		if rows == 0 then return ""
+			else do
+				[[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
+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"
+
+htmlOutput s = case parse wikiParser "" s of
+					Right n -> putStr (toHtml n)
+					Left e -> print e