Commit eadf9e9d authored by Ulrich Kemloh's avatar Ulrich Kemloh

fixed: event file parameter.

fixed: JPS version in routing file
parent 2a3c598b
......@@ -107,7 +107,7 @@ bool EventManager::ReadEventsXml()
TiXmlElement* xMainNode = doc.RootElement();
string eventfile = "";
if (xMainNode->FirstChild("events")) {
if (xMainNode->FirstChild("events_file")) {
eventfile = _projectRootDir
+ xMainNode->FirstChild("events_file")->FirstChild()->Value();
Log->Write("INFO: \tevents <" + eventfile + ">");
......@@ -305,8 +305,8 @@ bool EventManager::UpdateRoute(Pedestrian* ped)
}
else
{
Log->Write("ERROR: \t unknown configuration %s", key.c_str());
Log->Write("ERROR: \t [%d] router available", _eventEngineStorage.size());
//Log->Write("ERROR: \t unknown configuration %s", key.c_str());
//Log->Write("ERROR: \t [%d] router available", _eventEngineStorage.size());
status= false;
}
return status;
......
......@@ -1521,7 +1521,7 @@ bool GlobalRouter::LoadRoutingInfos(const std::string &filename)
}
string version = xRootNode->Attribute("version");
if (version != JPS_VERSION) {
if (version != JPS_VERSION && version != JPS_OLD_VERSION) {
Log->Write("ERROR: \tOnly version %d.%d supported",JPS_VERSION_MAJOR,JPS_VERSION_MINOR);
Log->Write("ERROR: \tparsing routing file failed!");
return false;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment