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
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)
pEol
return (Paragraph)
-pOneEol = do
- pEol
+
+pSpace = do
+ space
return (Text " ")
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
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++"'"