diff options
| author | krasimir <krasimir@chalmers.se> | 2009-10-15 11:32:25 +0000 |
|---|---|---|
| committer | krasimir <krasimir@chalmers.se> | 2009-10-15 11:32:25 +0000 |
| commit | 861e0a4c13db96d10be40156ebdc2783d27e78ff (patch) | |
| tree | 8df61b7fadf4a380e80e9b90a05554733555ebba /src/server/PGFService.hs | |
| parent | 93da32c1d43945c709fadf3fcaaedef369cc8046 (diff) | |
make the GF server to compile after that changes in the PGF runtime
Diffstat (limited to 'src/server/PGFService.hs')
| -rw-r--r-- | src/server/PGFService.hs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/server/PGFService.hs b/src/server/PGFService.hs index 576ba7a30..d0fac03d9 100644 --- a/src/server/PGFService.hs +++ b/src/server/PGFService.hs @@ -57,7 +57,7 @@ pgfMain pgf command = getTree :: CGI PGF.Tree getTree = do mt <- getInput "tree" t <- maybe (throwCGIError 400 "No tree given" ["No tree given"]) return mt - maybe (throwCGIError 400 "Bad tree" ["Bad tree: " ++ t]) return (PGF.readTree t) + maybe (throwCGIError 400 "Bad tree" ["Bad tree: " ++ t]) return (PGF.readExpr t) getCat :: CGI (Maybe PGF.Type) getCat = @@ -106,7 +106,7 @@ doTranslate pgf input mcat mfrom mto = showJSON $ map toJSObject doParse :: PGF -> String -> Maybe PGF.Type -> Maybe PGF.Language -> JSValue doParse pgf input mcat mfrom = showJSON $ map toJSObject - [[("from", PGF.showLanguage from),("tree",PGF.showTree tree)] + [[("from", PGF.showLanguage from),("tree",PGF.showExpr [] tree)] | (from,trees) <- parse' pgf input mcat mfrom, tree <- trees ] @@ -125,7 +125,7 @@ doLinearize pgf tree mto = showJSON $ map toJSObject doRandom :: PGF -> Maybe PGF.Type -> Maybe Int -> IO JSValue doRandom pgf mcat mlimit = do trees <- random' pgf mcat - return $ showJSON $ map toJSObject [[("tree", PGF.showTree tree)] | tree <- limit trees] + return $ showJSON $ map toJSObject [[("tree", PGF.showExpr [] tree)] | tree <- limit trees] where limit = take (fromMaybe 1 mlimit) doGrammar :: PGF -> Maybe (Accept Language) -> JSValue @@ -139,7 +139,7 @@ doGrammar pgf macc = showJSON $ toJSObject ("languageCode", showJSON $ fromMaybe "" (PGF.languageCode pgf l)), ("canParse", showJSON $ PGF.canParse pgf l)] | l <- PGF.languages pgf] - categories = map toJSObject [[("cat", PGF.showType cat)] | cat <- PGF.categories pgf] + categories = map toJSObject [[("cat", PGF.showType [] cat)] | cat <- PGF.categories pgf] instance JSON PGF.CId where readJSON x = readJSON x >>= maybe (fail "Bad language.") return . PGF.readLanguage |