summaryrefslogtreecommitdiff
path: root/project2/cgi
diff options
context:
space:
mode:
authorrandomdan <randomdan@localhost>2011-02-15 20:18:18 +0000
committerrandomdan <randomdan@localhost>2011-02-15 20:18:18 +0000
commit4dbb580ff5b5a75c0a9d46c8a4673f9e3eff30bc (patch)
tree957a972ca06e0662e3b2a8a1a97f5844be5c7b05 /project2/cgi
parentAdd debug option for dumping the data document before sending it to the web s... (diff)
downloadproject2-4dbb580ff5b5a75c0a9d46c8a4673f9e3eff30bc.tar.bz2
project2-4dbb580ff5b5a75c0a9d46c8a4673f9e3eff30bc.tar.xz
project2-4dbb580ff5b5a75c0a9d46c8a4673f9e3eff30bc.zip
Tidied up XML loader using boost::multi_index
Diffstat (limited to 'project2/cgi')
-rw-r--r--project2/cgi/cgiAppEngine.cpp24
-rw-r--r--project2/cgi/cgiAppEngine.h2
2 files changed, 13 insertions, 13 deletions
diff --git a/project2/cgi/cgiAppEngine.cpp b/project2/cgi/cgiAppEngine.cpp
index 1d00c18..f3f8d56 100644
--- a/project2/cgi/cgiAppEngine.cpp
+++ b/project2/cgi/cgiAppEngine.cpp
@@ -96,9 +96,9 @@ CgiApplicationEngine::PresentStage::~PresentStage()
CgiApplicationEngine::StagePtr
CgiApplicationEngine::PresentStage::run()
{
- BOOST_FOREACH(OrderedParamCheckers::value_type pc, parameterChecks) {
- if (!pc.second->performCheck()) {
- return new PresentStage(appEngine, pc.second->present);
+ BOOST_FOREACH(ParamCheckers::value_type pc, parameterChecks.get<bySOOrder>()) {
+ if (!pc->performCheck()) {
+ return new PresentStage(appEngine, pc->present);
}
}
execute();
@@ -164,25 +164,25 @@ CgiApplicationEngine::RequestStage::~RequestStage()
CgiApplicationEngine::StagePtr
CgiApplicationEngine::RequestStage::run()
{
- BOOST_FOREACH(OrderedParamCheckers::value_type pc, parameterChecks) {
- if (!pc.second->performCheck()) {
- return new PresentStage(appEngine, pc.second->present);
+ BOOST_FOREACH(const ParamCheckers::value_type & pc, parameterChecks.get<bySOOrder>()) {
+ if (!pc->performCheck()) {
+ return new PresentStage(appEngine, pc->present);
}
}
try {
- BOOST_FOREACH(NoOutputExecutes::value_type t, tasks) {
- t.second->execute();
+ BOOST_FOREACH(const NoOutputExecutes::value_type & t, tasks.get<bySOOrder>()) {
+ t->execute();
}
// Commit data source transactions (without invoking a connection)
- BOOST_FOREACH(DataSources::value_type ds, datasources) {
- ds.second->commit();
+ BOOST_FOREACH(const DataSources::value_type & ds, datasources) {
+ ds->commit();
}
return new PresentStage(appEngine, present);
}
catch (...) {
// Do something about the error
- BOOST_FOREACH(DataSources::value_type ds, datasources) {
- ds.second->rollback();
+ BOOST_FOREACH(const DataSources::value_type & ds, datasources) {
+ ds->rollback();
}
throw;
}
diff --git a/project2/cgi/cgiAppEngine.h b/project2/cgi/cgiAppEngine.h
index 25c6537..2bef0f6 100644
--- a/project2/cgi/cgiAppEngine.h
+++ b/project2/cgi/cgiAppEngine.h
@@ -65,7 +65,7 @@ class CgiApplicationEngine : public ApplicationEngine {
virtual StagePtr run();
std::string present;
protected:
- OrderedParamCheckers parameterChecks;
+ ParamCheckers parameterChecks;
NoOutputExecutes tasks;
};