From 5c0fb2cb7ec3185442cca5e7980c40603e07b628 Mon Sep 17 00:00:00 2001
From: aarne <aarne@chalmers.se>
Date: Fri, 26 Mar 2010 22:08:48 +0000
Subject: [PATCH] text-like unlexer for phrasebook web service

---
 src/server/PGFService.hs | 16 ++++++++++++++--
 src/server/lighttpd.conf |  3 ++-
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/server/PGFService.hs b/src/server/PGFService.hs
index 6f2e38a33..b8c8f7aff 100644
--- a/src/server/PGFService.hs
+++ b/src/server/PGFService.hs
@@ -116,19 +116,20 @@ doTranslate pgf input mcat mfrom mto =
                   ("tree",          showJSON tree),
                   ("linearizations",showJSON 
                      [toJSObject [("to", PGF.showLanguage to),("text",output)]
-                       | (to,output) <- linearize' pgf mto tree]
+                       | (to,output) <- linearizeAndBind pgf mto tree]
                   )
                  ]
            | (from,trees) <- parse' pgf input mcat mfrom,
              tree <- trees]
 
+-- used in phrasebook
 doTranslateGroup :: PGF -> String -> Maybe PGF.Type -> Maybe PGF.Language -> Maybe PGF.Language -> JSValue
 doTranslateGroup pgf input mcat mfrom mto =
   showJSON
      [toJSObject [("from",          showJSON (langOnly (PGF.showLanguage from))),
                   ("to",            showJSON (langOnly (PGF.showLanguage to))),
                   ("linearizations",showJSON 
-                      [toJSObject [("text", doBind alt)] | alt <- output])
+                      [toJSObject [("text", doText (doBind alt))] | alt <- output])
                  ]
         | 
           (from,trees) <- parse' pgf input mcat mfrom,
@@ -141,6 +142,9 @@ doTranslateGroup pgf input mcat mfrom mto =
        more (l,s) = 
          Map.insertWith (\ [x] xs -> if elem x xs then xs else (x : xs)) l s
    doBind = unwords . bind . words
+   doText s = case s of
+     c:cs | elem (last s) ".?!" -> toUpper c : init (init cs) ++ [last s]
+     _ -> s
    bind ws = case ws of
          w : "&+" : u : ws2 -> bind ((w ++ u) : ws2)
          w : ws2            -> w : bind ws2
@@ -276,6 +280,14 @@ linearize' pgf mto tree =
       Nothing -> PGF.linearizeAllLang pgf tree
       Just to -> [(to,PGF.linearize pgf to tree)]
 
+linearizeAndBind pgf mto t = [(la, binds s) | (la,s) <- linearize' pgf mto t]
+  where
+    binds = unwords . bs . words
+    bs ws = case ws of
+      u:"&+":v:ws2 -> bs ((u ++ v):ws2)
+      u:ws2        -> u : bs ws2
+      _            -> []
+
 random' :: PGF -> Maybe PGF.Type -> IO [PGF.Tree]
 random' pgf mcat = PGF.generateRandom pgf (fromMaybe (PGF.startCat pgf) mcat)
 
diff --git a/src/server/lighttpd.conf b/src/server/lighttpd.conf
index 85ea3314c..2668faaf4 100644
--- a/src/server/lighttpd.conf
+++ b/src/server/lighttpd.conf
@@ -6,7 +6,8 @@ server.modules              = (
                                 "mod_access",
                                 "mod_fastcgi",
                                 "mod_accesslog",
-                                "mod_redirect"
+                                "mod_redirect",
+                                "mod_cgi"
                               )
 
 var.basedir = var.CWD