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

diff --git a/Wiki.hs b/Wiki.hs
index d7ce7bc..7d337c9 100644
--- a/Wiki.hs
+++ b/Wiki.hs
@@ -1,29 +1,86 @@
 module Wiki (
-	WB
+	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 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
+
+data Markup = Text String
+	| Paragraph 
+	| Link String 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)
+
+
+pSpace = do
+	space 
+	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)
+pLink = do
+	string "[["
+	l <- many1 $ noneOf "]"
+	string "]]"
+	return (Link l l)
+pOtherChar = do
+	c <- oneOf ",;.:!?[]()\'\"=-%$£<>/\\|"
+	return (Text (c:[]))
+
+pText = do
+	t <- many1 alphaNum--(noneOf ['\n','\r','[',']'])
+	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)
@@ -31,20 +88,49 @@ createPGB host database user password = let db = createDBService host database "
 
 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)++"'"
+		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 ""
-
-	setCurrent (PGB db) key id = 
-		execute db $ "UPDATE current SET id = '"++(escapeQuery id)++"' where keyword = '"++(escapeQuery key)++"'"
-
-	addNew (PGB db) key text = return ""
+	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
+			
+
+tov :: String -> String
+tov s = '\'':escapeQuery s++"'"
+