diff options
| author | randomdan <randomdan@localhost> | 2010-08-31 19:51:02 +0000 |
|---|---|---|
| committer | randomdan <randomdan@localhost> | 2010-08-31 19:51:02 +0000 |
| commit | ac4136de947054a1673a9bc004e47824ada549ce (patch) | |
| tree | e4fcd16d531847ad17961f97d0d588e4cf659400 /project2/cgi | |
| parent | Add alarm to be called when p2web has been idle for 60seconds (diff) | |
| download | project2-ac4136de947054a1673a9bc004e47824ada549ce.tar.bz2 project2-ac4136de947054a1673a9bc004e47824ada549ce.tar.xz project2-ac4136de947054a1673a9bc004e47824ada549ce.zip | |
Drop the pain in the ass SHM session container in favour of an XML one
Fix setting the environment up in p2console
Diffstat (limited to 'project2/cgi')
| -rw-r--r-- | project2/cgi/cgiAppEngine.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/project2/cgi/cgiAppEngine.cpp b/project2/cgi/cgiAppEngine.cpp index f37172e..e419ddf 100644 --- a/project2/cgi/cgiAppEngine.cpp +++ b/project2/cgi/cgiAppEngine.cpp @@ -9,14 +9,14 @@ #include <boost/bind.hpp> #include <boost/lexical_cast.hpp> #include <boost/uuid/uuid_io.hpp> -#include "../sessionShm.h" +#include "../sessionXml.h" #include <boost/uuid/uuid_generators.hpp> const std::string SESSIONID = "sessionID"; typedef boost::uuids::uuid SIDKey; typedef std::string SValue; -SessionContainer * sessionsContainer = new SessionContainerShm(); +SessionContainer * sessionsContainer = new SessionContainerXml(); CgiApplicationEngine::CgiApplicationEngine(const CgiEnvironment * e) : ApplicationEngine(), @@ -118,7 +118,7 @@ CgiApplicationEngine::PresentStage::getDataDocument() const xmlpp::Element * sessionXml = responseRoot->add_child("session", "project2"); sessionXml->set_attribute("id", boost::lexical_cast<Glib::ustring>(appEngine->sessionID)); Session::Values session(sessionsContainer->GetSession(appEngine->sessionID)->GetValuesCopy()); - BOOST_FOREACH(SessionShm::Values::value_type sv, session) { + BOOST_FOREACH(Session::Values::value_type sv, session) { xmlpp::Element * param = sessionXml->add_child("var", "project2"); param->add_child_text(sv.second); param->set_attribute("name", sv.first); |