diff options
Diffstat (limited to 'src/compiler/GF')
| -rw-r--r-- | src/compiler/GF/Command/Commands.hs | 4 | ||||
| -rw-r--r-- | src/compiler/GF/Server.hs | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/compiler/GF/Command/Commands.hs b/src/compiler/GF/Command/Commands.hs index cf1262f35..ea62ba69a 100644 --- a/src/compiler/GF/Command/Commands.hs +++ b/src/compiler/GF/Command/Commands.hs @@ -551,7 +551,7 @@ pgfCommands = Map.fromList [ let outp = valStrOpts "output" "dot" opts mlab <- case file of "" -> return Nothing - _ -> (Just . getDepLabels . lines) `fmap` restricted (readFile file) + _ -> (Just . getDepLabels) `fmap` restricted (readFile file) let lang = optLang pgf opts let grphs = map (graphvizDependencyTree outp debug mlab Nothing pgf lang) es if isOpt "conll2latex" opts @@ -616,7 +616,7 @@ pgfCommands = Map.fromList [ let depfile = valStrOpts "file" "" opts mlab <- case depfile of "" -> return Nothing - _ -> (Just . getDepLabels . lines) `fmap` restricted (readFile depfile) + _ -> (Just . getDepLabels) `fmap` restricted (readFile depfile) let grphs = map (graphvizParseTreeDep mlab pgf lang gvOptions) es if isFlag "view" opts || isFlag "format" opts then do diff --git a/src/compiler/GF/Server.hs b/src/compiler/GF/Server.hs index 3a193cc33..d5c84b87c 100644 --- a/src/compiler/GF/Server.hs +++ b/src/compiler/GF/Server.hs @@ -174,7 +174,7 @@ handle logLn documentroot state0 cache execute1 stateVar (_ ,_ ,".pgf") -> do --debug $ "PGF service: "++path wrapCGI $ PS.cgiMain' cache path (dir,"grammars.cgi",_ ) -> grammarList dir (decoded qs) - (dir ,"exb.fcgi" ,_ ) -> wrapCGI $ ES.cgiMain' root dir (fst cache) + (dir ,"exb.fcgi" ,_ ) -> wrapCGI $ ES.cgiMain' root dir (PS.pgfCache cache) _ -> serveStaticFile rpath path where path = translatePath rpath _ -> return $ resp400 upath |