From b849d008d293b18e3b71eb160d94ca1c20c92d27 Mon Sep 17 00:00:00 2001
From: Dennis Luxen <info@project-osrm.org>
Date: Mon, 9 Dec 2013 10:48:32 -0500
Subject: [PATCH] break-out Requesthandler into compile unit

---
 Server/RequestHandler.h | 82 ++---------------------------------------
 1 file changed, 4 insertions(+), 78 deletions(-)

diff --git a/Server/RequestHandler.h b/Server/RequestHandler.h
index 37802fe49..1250230c0 100644
--- a/Server/RequestHandler.h
+++ b/Server/RequestHandler.h
@@ -30,94 +30,20 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "APIGrammar.h"
 #include "DataStructures/RouteParameters.h"
+#include "Http/Reply.h"
 #include "Http/Request.h"
 #include "../Library/OSRM.h"
-#include "../Util/SimpleLogger.h"
-#include "../Util/StringUtil.h"
-#include "../typedefs.h"
 
-#include <boost/foreach.hpp>
 #include <boost/noncopyable.hpp>
 
-#include <algorithm>
-#include <iostream>
-#include <iterator>
 #include <string>
 
 class RequestHandler : private boost::noncopyable {
 public:
     typedef APIGrammar<std::string::iterator, RouteParameters> APIGrammarParser;
-    explicit RequestHandler() : routing_machine(NULL) { }
-
-    void handle_request(const http::Request& req, http::Reply& rep){
-        //parse command
-        try {
-            std::string request(req.uri);
-
-            time_t ltime;
-            struct tm *Tm;
-
-            ltime=time(NULL);
-            Tm=localtime(&ltime);
-
-            SimpleLogger().Write() <<
-                (Tm->tm_mday < 10 ? "0" : "" )  << Tm->tm_mday    << "-" <<
-                (Tm->tm_mon+1 < 10 ? "0" : "" ) << (Tm->tm_mon+1) << "-" <<
-                1900+Tm->tm_year << " " << (Tm->tm_hour < 10 ? "0" : "" ) <<
-                Tm->tm_hour << ":" << (Tm->tm_min < 10 ? "0" : "" ) <<
-                Tm->tm_min << ":" << (Tm->tm_sec < 10 ? "0" : "" ) <<
-                Tm->tm_sec << " " << req.endpoint.to_string() << " " <<
-                req.referrer << ( 0 == req.referrer.length() ? "- " :" ") <<
-                req.agent << ( 0 == req.agent.length() ? "- " :" ") << req.uri;
-
-            RouteParameters routeParameters;
-            APIGrammarParser apiParser(&routeParameters);
-
-            std::string::iterator it = request.begin();
-            const bool result = boost::spirit::qi::parse(
-                it,
-                request.end(),
-                apiParser
-            );
-
-            if ( !result || (it != request.end()) ) {
-                rep = http::Reply::StockReply(http::Reply::badRequest);
-                const int position = std::distance(request.begin(), it);
-                std::string tmp_position_string;
-                intToString(position, tmp_position_string);
-                rep.content.push_back(
-                    "Input seems to be malformed close to position "
-                    "<br><pre>"
-                );
-                rep.content.push_back( request );
-                rep.content.push_back(tmp_position_string);
-                rep.content.push_back("<br>");
-                const unsigned end = std::distance(request.begin(), it);
-                for(unsigned i = 0; i < end; ++i) {
-                    rep.content.push_back("&nbsp;");
-                }
-                rep.content.push_back("^<br></pre>");
-            } else {
-                //parsing done, lets call the right plugin to handle the request
-                BOOST_ASSERT_MSG(
-                    routing_machine != NULL,
-                    "pointer not init'ed"
-                );
-                routing_machine->RunQuery(routeParameters, rep);
-                return;
-            }
-        } catch(std::exception& e) {
-            rep = http::Reply::StockReply(http::Reply::internalServerError);
-            SimpleLogger().Write(logWARNING) <<
-                "[server error] code: " << e.what() << ", uri: " << req.uri;
-            return;
-        }
-    };
-
-    void RegisterRoutingMachine(OSRM * osrm) {
-        routing_machine = osrm;
-    }
-
+    explicit RequestHandler();
+    void handle_request(const http::Request& req, http::Reply& rep);
+    void RegisterRoutingMachine(OSRM * osrm);
 private:
     OSRM * routing_machine;
 };