diff options
| author | bjorn <bjorn@bringert.net> | 2008-09-17 12:37:34 +0000 |
|---|---|---|
| committer | bjorn <bjorn@bringert.net> | 2008-09-17 12:37:34 +0000 |
| commit | db6ff30694da3a52e69c0c78f4b885027e88cf53 (patch) | |
| tree | 16165afd9ea3147156519c5cf68674242550fcfe /src/server/MainFastCGI.hs | |
| parent | 417ada31f54e04e01e30ab111dbba95b6d7413bf (diff) | |
fastcgi: replace /categories, /languages and /mylanguage with /info.
Diffstat (limited to 'src/server/MainFastCGI.hs')
| -rw-r--r-- | src/server/MainFastCGI.hs | 29 |
1 files changed, 13 insertions, 16 deletions
diff --git a/src/server/MainFastCGI.hs b/src/server/MainFastCGI.hs index 181af7836..016ddc773 100644 --- a/src/server/MainFastCGI.hs +++ b/src/server/MainFastCGI.hs @@ -36,9 +36,7 @@ cgiMain pgf = "/complete" -> return (doComplete pgf) `ap` getText `ap` getCat `ap` getFrom `ap` getLimit "/linearize" -> return (doLinearize pgf) `ap` getTree `ap` getTo "/translate" -> return (doTranslate pgf) `ap` getText `ap` getCat `ap` getFrom `ap` getTo - "/categories" -> return $ doCategories pgf - "/languages" -> return $ doLanguages pgf - "/mylanguage" -> return (doMyLanguage pgf) `ap` requestAcceptLanguage + "/info" -> return (doInfo pgf) `ap` requestAcceptLanguage _ -> throwCGIError 404 "Not Found" ["Resource not found: " ++ path] outputJSON json where @@ -102,19 +100,18 @@ doLinearize :: PGF -> PGF.Tree -> Maybe PGF.Language -> JSValue doLinearize pgf tree mto = showJSON $ map toJSObject [[("to",to),("text",text)] | (to,text) <- linearize' pgf mto tree] -doLanguages :: PGF -> JSValue -doLanguages pgf = showJSON $ map toJSObject - [[("name", showJSON l), - ("languageCode", showJSON $ fromMaybe "" (PGF.languageCode pgf l)), - ("canParse", showJSON $ PGF.canParse pgf l)] - | l <- PGF.languages pgf] - -doCategories :: PGF -> JSValue -doCategories pgf = showJSON $ map toJSObject - [[("cat",cat)] | cat <- PGF.categories pgf] - -doMyLanguage :: PGF -> Maybe (Accept Language) -> JSValue -doMyLanguage pgf macc = showJSON $ toJSObject [("languageName", selectLanguage pgf macc)] +doInfo :: PGF -> Maybe (Accept Language) -> JSValue +doInfo pgf macc = showJSON $ toJSObject + [("name", showJSON (PGF.abstractName pgf)), + ("userLanguage", showJSON (selectLanguage pgf macc)), + ("categories", showJSON categories), + ("languages", showJSON languages)] + where languages = map toJSObject + [[("name", showJSON l), + ("languageCode", showJSON $ fromMaybe "" (PGF.languageCode pgf l)), + ("canParse", showJSON $ PGF.canParse pgf l)] + | l <- PGF.languages pgf] + categories = map toJSObject [[("cat", cat)] | cat <- PGF.categories pgf] -- * PGF utilities |