From a3e813914cb55c408216c0f7e32d599f7c81573b Mon Sep 17 00:00:00 2001 From: hallgren Date: Mon, 21 Nov 2011 15:15:49 +0000 Subject: [PATCH] example-based: bug fix: apply UTF-8 decoding to CGI inputs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit You can now use words with ÅÄÖ when writing Swedish grammars by example... --- src/example-based/ExampleService.hs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/example-based/ExampleService.hs b/src/example-based/ExampleService.hs index 185e4fd94..0e88ef414 100644 --- a/src/example-based/ExampleService.hs +++ b/src/example-based/ExampleService.hs @@ -4,6 +4,7 @@ import System.FilePath((),makeRelative) import Data.Map(fromList) import Data.Char(isDigit) import Data.Maybe(fromJust) +import qualified Codec.Binary.UTF8.String as UTF8 (decodeString) import PGF import GF.Compile.ToAPI import Network.CGI @@ -83,7 +84,7 @@ readParsePGF cwd cache = parseEnviron s = do state <- liftIO $ readIO s return $ environ state -getInp name = maybe err return =<< getInput name +getInp name = maybe err (return . UTF8.decodeString) =<< getInput name where err = throwCGIError 400 ("Missing parameter: "++name) []