GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-04-23 11:42:49 -06:00
Code Issues Packages Projects Releases Wiki Activity

Change JSON structures returned by the translation server to always be arrays of objects.

Browse Source
This commit is contained in:
bjorn
2008-09-12 11:05:38 +00:00
parent 1a320db136
commit a7bf88fb32
1 changed files with 27 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/server/MainFastCGI.hs
View File

@@ -76,27 +76,40 @@ cgiMain pgf =
_ -> return mlang _ -> return mlang
doTranslate :: PGF -> String -> Maybe PGF.Category -> Maybe PGF.Language -> Maybe PGF.Language -> JSValue doTranslate :: PGF -> String -> Maybe PGF.Category -> Maybe PGF.Language -> Maybe PGF.Language -> JSValue
doTranslate pgf input mcat mfrom mto = showJSON $ toJSObject $ doTranslate pgf input mcat mfrom mto = showJSON $ map toJSObject
[(from, [toJSObject (linearize' pgf mto tree) | tree <- trees]) [[("from",from),("to",to),("text",output)]
| (from,trees) <- parse' pgf input mcat mfrom] | (from,trees) <- parse' pgf input mcat mfrom,
tree <- trees,
(to,output) <- linearize' pgf mto tree]
doParse :: PGF -> String -> Maybe PGF.Category -> Maybe PGF.Language -> JSValue doParse :: PGF -> String -> Maybe PGF.Category -> Maybe PGF.Language -> JSValue
doParse pgf input mcat mfrom = showJSON $ toJSObject $ doParse pgf input mcat mfrom = showJSON $ map toJSObject
[(from, map PGF.showTree trees) | (from,trees) <- parse' pgf input mcat mfrom] [[("from",from),("tree",PGF.showTree tree)]
| (from,trees) <- parse' pgf input mcat mfrom,
tree <- trees ]
doComplete :: PGF -> String -> Maybe PGF.Category -> Maybe PGF.Language -> Maybe Int -> JSValue doComplete :: PGF -> String -> Maybe PGF.Category -> Maybe PGF.Language -> Maybe Int -> JSValue
doComplete pgf input mcat mfrom mlimit = showJSON $ toJSObject $ complete' pgf input mcat mfrom mlimit doComplete pgf input mcat mfrom mlimit = showJSON $ map toJSObject $ limit
[[("from",from),("text",text)]
| (from,compls) <- complete' pgf input mcat mfrom,
text <- compls]
where
limit xs = maybe xs (\n -> take n xs) mlimit
doLinearize :: PGF -> PGF.Tree -> Maybe PGF.Language -> JSValue doLinearize :: PGF -> PGF.Tree -> Maybe PGF.Language -> JSValue
doLinearize pgf tree mto = showJSON $ toJSObject $ linearize' pgf mto tree doLinearize pgf tree mto = showJSON $ map toJSObject
[[("to",to),("text",text)] | (to,text) <- linearize' pgf mto tree]
doLanguages :: PGF -> JSValue doLanguages :: PGF -> JSValue
doLanguages pgf = showJSON $ toJSObject [(l,toJSObject (info l)) | l <- PGF.languages pgf] doLanguages pgf = showJSON $ map toJSObject
where info l = [("languageCode", showJSON (fromMaybe "" (PGF.languageCode pgf l))), [[("lang", showJSON l),
("canParse", showJSON (PGF.canParse pgf l))] ("languageCode", showJSON $ fromMaybe "" (PGF.languageCode pgf l)),
("canParse", showJSON $ PGF.canParse pgf l)]
| l <- PGF.languages pgf]
doCategories :: PGF -> JSValue doCategories :: PGF -> JSValue
doCategories pgf = showJSON (PGF.categories pgf) doCategories pgf = showJSON $ map toJSObject
[[("cat",cat)] | cat <- PGF.categories pgf]
-- * PGF utilities -- * PGF utilities
@@ -107,12 +120,11 @@ parse' pgf input mcat mfrom =
where froms = maybe (PGF.languages pgf) (:[]) mfrom where froms = maybe (PGF.languages pgf) (:[]) mfrom
cat = fromMaybe (PGF.startCat pgf) mcat cat = fromMaybe (PGF.startCat pgf) mcat
complete' :: PGF -> String -> Maybe PGF.Category -> Maybe PGF.Language -> Maybe Int -> [(PGF.Language,[String])] complete' :: PGF -> String -> Maybe PGF.Category -> Maybe PGF.Language -> [(PGF.Language,[String])]
complete' pgf input mcat mfrom mlimit = complete' pgf input mcat mfrom =
limit [(from,ss) | from <- froms, PGF.canParse pgf from, let ss = complete pgf from cat input, not (null ss)] [(from,ss) | from <- froms, PGF.canParse pgf from, let ss = complete pgf from cat input, not (null ss)]
where froms = maybe (PGF.languages pgf) (:[]) mfrom where froms = maybe (PGF.languages pgf) (:[]) mfrom
cat = fromMaybe (PGF.startCat pgf) mcat cat = fromMaybe (PGF.startCat pgf) mcat
limit xs = maybe xs (\n -> take n xs) mlimit
complete :: PGF -> PGF.Language -> PGF.Category -> String -> [String] complete :: PGF -> PGF.Language -> PGF.Category -> String -> [String]
complete pgf from cat input = complete pgf from cat input =