Merge branch 'libosrm' of https://github.com/DennisOSRM/Project-OSRM into libosrm

Library/OSRM.cpp

@@ -21,6 +21,10 @@ or see http://www.gnu.org/licenses/agpl.txt.
 #include "OSRM.h"
 
 OSRM::OSRM(const char * server_ini_path) {
+    if( !testDataFile(server_ini_path) ){
+        throw OSRMException("server.ini not found");
+    }
+
     BaseConfiguration serverConfig(server_ini_path);
     objects = new QueryObjectsStorage(
         serverConfig.GetParameter("hsgrData"),

Library/OSRM.h

@@ -31,15 +31,26 @@ or see http://www.gnu.org/licenses/agpl.txt.
 #include "../Plugins/ViaRoutePlugin.h"
 #include "../Plugins/RouteParameters.h"
 #include "../Util/BaseConfiguration.h"
+#include "../Util/InputFileUtil.h"
 #include "../Server/BasicDatastructures.h"
 
-
 #include <boost/assert.hpp>
 #include <boost/noncopyable.hpp>
 #include <boost/thread.hpp>
 
+#include <exception>
 #include <vector>
 
+class OSRMException: public std::exception {
+public:
+    OSRMException(const char * message) : message(message) {}
+private:
+    virtual const char* what() const throw() {
+        return message;
+    }
+    const char * message;
+};
+
 class OSRM : boost::noncopyable {
     typedef boost::unordered_map<std::string, BasePlugin *> PluginMap;
     QueryObjectsStorage * objects;