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

fixes for webdemos, including bug in StructuralIta

Browse Source
This commit is contained in:
aarne
2010-03-26 17:38:20 +00:00
parent 1d41c587ac
commit c24440d134
4 changed files with 11 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/server/PGFService.hs
View File

@@ -125,10 +125,10 @@ doTranslate pgf input mcat mfrom mto =
doTranslateGroup :: PGF -> String -> Maybe PGF.Type -> Maybe PGF.Language -> Maybe PGF.Language -> JSValue
doTranslateGroup pgf input mcat mfrom mto =
showJSON
[toJSObject [("from", showJSON (PGF.showLanguage from)),
("to", showJSON (PGF.showLanguage to)),
[toJSObject [("from", showJSON (langOnly (PGF.showLanguage from))),
("to", showJSON (langOnly (PGF.showLanguage to))),
("linearizations",showJSON
[toJSObject [("text", unlines output)]])
[toJSObject [("text", doBind alt)] | alt <- output])
]
|
(from,trees) <- parse' pgf input mcat mfrom,
@@ -140,6 +140,12 @@ doTranslateGroup pgf input mcat mfrom mto =
start ls = [(l,[s]) | (l,s) <- ls]
more (l,s) =
Map.insertWith (\ [x] xs -> if elem x xs then xs else (x : xs)) l s
doBind = unwords . bind . words
bind ws = case ws of
w : "&+" : u : ws2 -> bind ((w ++ u) : ws2)
w : ws2 -> w : bind ws2
_ -> ws
langOnly = reverse . take 3 . reverse
doParse :: PGF -> String -> Maybe PGF.Type -> Maybe PGF.Language -> JSValue