Backend (getCurrent,getList,get,setCurrent,update)
,PGB
,createPGB
- ,Markup (Text, Paragraph, Link)
+ ,Markup (Text, Paragraph, Link, Bold, Emph)
,Document
,wikiParser
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
data Markup = Text String
| Paragraph
| Link String String
+ | Bold [Markup]
+ | Emph [Markup]
type Document = [Markup]
wikiParser :: GenParser Char st Document
wikiParser = do
- s <- (try (pPara)
- <|> pSpace
- <|> try (pLinkLong)
- <|> try (pLink)
- <|> pOtherChar
- <|> pText)
+ s <- pMain
ss <- (wikiParser <|> return [])
return (s:ss)
string "[["
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)
+
+pBold = do
+ string "**"
+ s <- pStringParser "**"
+ return (Bold s)
+
+pEmph = do
+ string "//"
+ s <- pStringParser "//"
+ return (Emph s)
+
+pStringParser xs = do
+ (string xs >> return []) <|> (do
+ s <- pMain
+ ss <- pStringParser xs
+ return (s:ss))
+
+pMain = (try (pPara)
+ <|> pSpace
+ <|> try(pBold)
+ <|> try(pEmph)
+ <|> try (pLinkLong)
+ <|> try (pLink)
+ <|> pOtherChar
+ <|> pText)
+
pOtherChar = do
- c <- satisfy validChar
+ c <- oneOf "*,;.:!?[]()'\"=-%$£<>/\\|"
return (Text (c:[]))
pText = do
t <- many1 alphaNum--(noneOf ['\n','\r','[',']'])
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 '>' = True
-validChar '/' = True
-validChar '\\' = True
-validChar '|' = True
-validChar _ = False
-
newtype PGB = PGB DBService
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++"'"