diff options
| author | randomdan <randomdan@localhost> | 2011-01-21 13:56:10 +0000 |
|---|---|---|
| committer | randomdan <randomdan@localhost> | 2011-01-21 13:56:10 +0000 |
| commit | 1a1e39ea34b1a7d004b4afa88a437b07977843ed (patch) | |
| tree | 283fae70e9d94de30293b9472ecc2b0f5b7afa15 /project2/cgi | |
| parent | Remove file create date for not being the create date (diff) | |
| download | project2-1a1e39ea34b1a7d004b4afa88a437b07977843ed.tar.bz2 project2-1a1e39ea34b1a7d004b4afa88a437b07977843ed.tar.xz project2-1a1e39ea34b1a7d004b4afa88a437b07977843ed.zip | |
Add wrappers and Jam for building with UUIDs from OSSP instead of Boost
Diffstat (limited to 'project2/cgi')
| -rw-r--r-- | project2/cgi/cgiAppEngine.cpp | 14 | ||||
| -rw-r--r-- | project2/cgi/cgiAppEngine.h | 4 |
2 files changed, 7 insertions, 11 deletions
diff --git a/project2/cgi/cgiAppEngine.cpp b/project2/cgi/cgiAppEngine.cpp index f4a4fb0..12a30d7 100644 --- a/project2/cgi/cgiAppEngine.cpp +++ b/project2/cgi/cgiAppEngine.cpp @@ -7,13 +7,10 @@ #include "../xmlObjectLoader.h" #include "../iterate.h" #include <boost/bind.hpp> -#include <boost/lexical_cast.hpp> -#include <boost/uuid/uuid_io.hpp> #include "../sessionXml.h" -#include <boost/uuid/uuid_generators.hpp> const std::string SESSIONID = "sessionID"; -typedef boost::uuids::uuid SIDKey; +typedef UUID SIDKey; typedef std::string SValue; SessionContainer * sessionsContainer = new SessionContainerXml(); @@ -21,12 +18,11 @@ SessionContainer * sessionsContainer = new SessionContainerXml(); CgiApplicationEngine::CgiApplicationEngine(const CgiEnvironment * e) : ApplicationEngine(), _env(e), - header(NULL), - sessionID(boost::uuids::nil_generator()()) + header(NULL) { BOOST_FOREACH(const cgicc::HTTPCookie c, e->getCookieList()) { if (c.getName() == SESSIONID) { - sessionID = boost::uuids::string_generator()(c.getValue()); + sessionID = c.getValue(); } } if (_env->getRequestMethod() == "POST") { @@ -57,7 +53,7 @@ CgiApplicationEngine::process() const delete prev; } if (!sessionID.is_nil()) { - header->setCookie(cgicc::HTTPCookie(SESSIONID, boost::lexical_cast<std::string>(sessionID), "Session ID", + header->setCookie(cgicc::HTTPCookie(SESSIONID, sessionID.str(), "Session ID", _env->getServerName().substr(_env->getServerName().find(".")), 3600, "/", false)); } } @@ -124,7 +120,7 @@ CgiApplicationEngine::addAppData(const Presenter * p) const // Sessions variables if (!sessionID.is_nil()) { p->pushSub("session", "project2"); - p->addField("id", boost::lexical_cast<Glib::ustring>(sessionID)); + p->addField("id", sessionID.str()); Session::Values session(sessionsContainer->GetSession(sessionID)->GetValuesCopy()); BOOST_FOREACH(Session::Values::value_type sv, session) { p->pushSub("var", "project2"); diff --git a/project2/cgi/cgiAppEngine.h b/project2/cgi/cgiAppEngine.h index 7998648..abd4b9e 100644 --- a/project2/cgi/cgiAppEngine.h +++ b/project2/cgi/cgiAppEngine.h @@ -6,8 +6,8 @@ #include "../paramChecker.h" #include "../xmlPresenter.h" #include "../commonObjects.h" +#include "../uuid.h" #include <boost/intrusive_ptr.hpp> -#include <boost/uuid/uuid.hpp> #include <libxml++/document.h> #include <libxml++/parsers/domparser.h> @@ -63,7 +63,7 @@ class CgiApplicationEngine : public ApplicationEngine { virtual Stage * run(); }; mutable Stage * currentStage; - mutable boost::uuids::uuid sessionID; + mutable UUID sessionID; }; #endif |