diff options
| author | John J. Camilleri <john@johnjcamilleri.com> | 2018-11-28 19:23:05 +0100 |
|---|---|---|
| committer | John J. Camilleri <john@johnjcamilleri.com> | 2018-11-28 19:23:05 +0100 |
| commit | 07768ba4c42be7c886967102b28e8dd93a6a937f (patch) | |
| tree | 95d38c06d3063358fb4482853b6a297ef31042ff | |
| parent | e2401f32ca20f8ec9bea23df909139878ad3f8bf (diff) | |
Revert "Completely remove uses of example-based"
This reverts commit 69cea20dac8ac73fa0a61ed4ff427d2524ee253b.
| -rw-r--r-- | .ghci | 2 | ||||
| -rw-r--r-- | gf.cabal | 4 | ||||
| -rw-r--r-- | src/compiler/GF/Server.hs | 4 |
3 files changed, 7 insertions, 3 deletions
@@ -1,2 +1,2 @@ -:set -isrc/compiler -isrc/binary -isrc/runtime/haskell -isrc/server -isrc/server/transfer -idist/build/autogen -idist/build +:set -isrc/compiler -isrc/binary -isrc/runtime/haskell -isrc/server -isrc/example-based -isrc/server/transfer -idist/build/autogen -idist/build :set -fwarn-unused-imports -optP-DSERVER_MODE -optP-DUSE_INTERRUPT -optP-DCC_LAZY -optP-include -optPdist/build/autogen/cabal_macros.h -odir dist/build/gf/gf-tmp -hidir dist/build/gf/gf-tmp -stubdir dist/build/gf/gf-tmp @@ -287,7 +287,9 @@ Library CGIUtils Cache Fold - hs-source-dirs: src/server src/server/transfer + ExampleDemo + ExampleService + hs-source-dirs: src/server src/server/transfer src/example-based if flag(interrupt) cpp-options: -DUSE_INTERRUPT diff --git a/src/compiler/GF/Server.hs b/src/compiler/GF/Server.hs index 9192ed9c9..c287e8001 100644 --- a/src/compiler/GF/Server.hs +++ b/src/compiler/GF/Server.hs @@ -43,6 +43,7 @@ import GF.Infra.UseIO(readBinaryFile,writeBinaryFile,ePutStrLn) import GF.Infra.SIO(captureSIO) import GF.Data.Utilities(apSnd,mapSnd) import qualified PGFService as PS +import qualified ExampleService as ES import Data.Version(showVersion) import Paths_gf(getDataDir,version) import GF.Infra.BuildInfo (buildInfo) @@ -170,6 +171,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 (PS.pgfCache cache) _ -> serveStaticFile rpath path where path = translatePath rpath _ -> return $ resp400 upath @@ -207,7 +209,7 @@ handle logLn documentroot state0 cache execute1 stateVar ((_,(value,_)):qs1,qs2) -> do put_qs (qs1++qs2) return value _ -> err $ resp400 $ "no "++field++" in request" - + inDir ok = cd =<< look "dir" where cd ('/':dir@('t':'m':'p':_)) = |