diff options
| author | randomdan <randomdan@localhost> | 2013-06-23 15:43:32 +0000 |
|---|---|---|
| committer | randomdan <randomdan@localhost> | 2013-06-23 15:43:32 +0000 |
| commit | a529ac661fe3a52114dcd91352651d433e4d9fc8 (patch) | |
| tree | 47725a698f89358420499d49649d1f433f82df92 /project2/cgi | |
| parent | Move logger initialisation and optionSource loading out of environment into t... (diff) | |
| download | project2-a529ac661fe3a52114dcd91352651d433e4d9fc8.tar.bz2 project2-a529ac661fe3a52114dcd91352651d433e4d9fc8.tar.xz project2-a529ac661fe3a52114dcd91352651d433e4d9fc8.zip | |
Move script resolution out of environment into script reader
Diffstat (limited to 'project2/cgi')
| -rw-r--r-- | project2/cgi/cgiAppEngine.cpp | 6 | ||||
| -rw-r--r-- | project2/cgi/cgiProgRouter.cpp | 2 | ||||
| -rw-r--r-- | project2/cgi/cgiStageInitial.cpp | 4 | ||||
| -rw-r--r-- | project2/cgi/cgiStageRequest.cpp | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/project2/cgi/cgiAppEngine.cpp b/project2/cgi/cgiAppEngine.cpp index 0022a88..654c2ce 100644 --- a/project2/cgi/cgiAppEngine.cpp +++ b/project2/cgi/cgiAppEngine.cpp @@ -73,7 +73,7 @@ CgiApplicationEngine::process() const currentStage = currentStage.get<0>()->run(); } catch (const CheckHost::CheckFailure & cf) { - currentStage = NextStage(new PresentStage(_env->resolveScript(_env->presentRoot, cf.failedCheck->present(), false))); + currentStage = NextStage(new PresentStage(ScriptReader::resolveScript(_env->presentRoot, cf.failedCheck->present(), false))); } catch (const ScriptNotFound & nf) { if (_env->notFoundPresent.empty() || triedNotFound) { @@ -81,7 +81,7 @@ CgiApplicationEngine::process() const } else { triedNotFound = true; - currentStage = NextStage(new CustomNotFoundStage(nf, _env->resolveScript(_env->errorPresentRoot, _env->notFoundPresent, false))); + currentStage = NextStage(new CustomNotFoundStage(nf, ScriptReader::resolveScript(_env->errorPresentRoot, _env->notFoundPresent, false))); } } catch (const std::exception & ex) { @@ -90,7 +90,7 @@ CgiApplicationEngine::process() const } else { triedNotFound = true; - currentStage = NextStage(new CustomErrorStage(ex, _env->resolveScript(_env->errorPresentRoot, _env->onErrorPresent, false))); + currentStage = NextStage(new CustomErrorStage(ex, ScriptReader::resolveScript(_env->errorPresentRoot, _env->onErrorPresent, false))); } } } while (currentStage.get<0>()); diff --git a/project2/cgi/cgiProgRouter.cpp b/project2/cgi/cgiProgRouter.cpp index 089b94f..d187de2 100644 --- a/project2/cgi/cgiProgRouter.cpp +++ b/project2/cgi/cgiProgRouter.cpp @@ -35,7 +35,7 @@ class RoutingTable { } void setRouteScript() { - routeScript = Environment::getCurrent()->resolveScript(Environment::getCurrent()->datasourceRoot, routeScriptPath, true); + routeScript = ScriptReader::resolveScript(Environment::getCurrent()->datasourceRoot, routeScriptPath, true); routeScript->loader.addLoadTarget(routeScript->root(), Storer::into<ElementLoader>(&routes)); routes.clear(); routeScript->load(NULL, true); diff --git a/project2/cgi/cgiStageInitial.cpp b/project2/cgi/cgiStageInitial.cpp index 1fe4820..d5fe424 100644 --- a/project2/cgi/cgiStageInitial.cpp +++ b/project2/cgi/cgiStageInitial.cpp @@ -8,10 +8,10 @@ CgiApplicationEngine::InitialStage::run() { const CgiEnvironment * e = env(); if (e->getRequestMethod() == "POST") { - return NextStage(new RequestStage(e->resolveScript(e->requestRoot, e->router->route(), false))); + return NextStage(new RequestStage(ScriptReader::resolveScript(e->requestRoot, e->router->route(), false))); } else { - return NextStage(new PresentStage(e->resolveScript(e->presentRoot, e->router->isDefault() ? e->defaultPresent : e->router->route(), false))); + return NextStage(new PresentStage(ScriptReader::resolveScript(e->presentRoot, e->router->isDefault() ? e->defaultPresent : e->router->route(), false))); } } diff --git a/project2/cgi/cgiStageRequest.cpp b/project2/cgi/cgiStageRequest.cpp index 8fa06bf..37faaae 100644 --- a/project2/cgi/cgiStageRequest.cpp +++ b/project2/cgi/cgiStageRequest.cpp @@ -22,7 +22,7 @@ CgiApplicationEngine::RequestStage::run() runChecks(); execute(); if (!present().isNull()) { - return NextStage(new PresentStage(env()->resolveScript(env()->presentRoot, present(), false)), this); + return NextStage(new PresentStage(ScriptReader::resolveScript(env()->presentRoot, present(), false)), this); } return NextStage(NULL, this); } |