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

diff --git a/Wiki.hs b/Wiki.hs
index 64c4602..7d337c9 100644
--- a/Wiki.hs
+++ b/Wiki.hs
@@ -20,7 +20,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
@@ -37,9 +37,10 @@ type Document = [Markup]
 wikiParser :: GenParser Char st Document	
 wikiParser = do 
 	s <- (try (pPara) 
-		<|> pOneEol 
+		<|> pSpace 
 		<|> try (pLinkLong)
-		<|> pLink
+		<|> try (pLink)
+		<|> pOtherChar
 		<|> pText)
 	ss <- (wikiParser <|> return [])
 	return (s:ss)
@@ -49,8 +50,9 @@ pPara = do
 	pEol
 	return (Paragraph)
 
-pOneEol = do
-	pEol
+
+pSpace = do
+	space 
 	return (Text " ")
 
 pEol = char '\n' <|> do
@@ -59,21 +61,25 @@ pEol = char '\n' <|> do
 
 pLinkLong = do
 	string "[["
-	l <- many1 $ noneOf ['|','[',']']
+	l <- many1 $ noneOf ['|']
 	char '|'
-	d <- many1 $ noneOf ['|','[',']'] 
+	d <- many1 $ noneOf "]" 
 	string "]]"
 	return (Link l d)
 pLink = do
 	string "[["
-	l <- many1 $ noneOf ['|','[',']']
+	l <- many1 $ noneOf "]"
 	string "]]"
 	return (Link l l)
+pOtherChar = do
+	c <- oneOf ",;.:!?[]()\'\"=-%$£<>/\\|"
+	return (Text (c:[]))
 
 pText = do
-	t <- many1 (noneOf ['\n','\r','[',']'])
+	t <- many1 alphaNum--(noneOf ['\n','\r','[',']'])
 	return (Text t)
 
+
 newtype PGB = PGB DBService
 
 createPGB :: String -> String -> String -> String -> IO PGB
@@ -94,7 +100,11 @@ instance Backend PGB where
 		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 ""
+	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++"'"