fly/flightgear
1
0
Fork 0
Code Activity

Rewrite FGScheduledFlight::processTimeString

Browse source 
Use modern-style parsing to tolerate different numbers of
digits in time strings.
This commit is contained in:
James Turner 2021-07-21 22:57:16 +01:00
parent e64f70bc72
commit 364be50967
1 changed files with 37 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

77
src/Traffic/SchedFlight.cxx
View file

@ -172,51 +172,48 @@ FGScheduledFlight:: ~FGScheduledFlight()
time_t FGScheduledFlight::processTimeString(const string& theTime) time_t FGScheduledFlight::processTimeString(const string& theTime)
{ {
int weekday; int timeOffsetInDays = 0;
int timeOffsetInDays; int targetHour;
int targetHour; int targetMinute;
int targetMinute; int targetSecond;
int targetSecond;
tm targetTimeDate; tm targetTimeDate;
SGTime* currTimeDate = globals->get_time_params(); SGTime* currTimeDate = globals->get_time_params();
string timeCopy = theTime; string timeCopy = theTime;
// okay first split theTime string into // okay first split theTime string into
// weekday, hour, minute, second; // weekday, hour, minute, second;
// Check if a week day is specified // Check if a week day is specified
if (timeCopy.find("/",0) != string::npos) const auto daySeperatorPos = timeCopy.find("/", 0);
{ if (daySeperatorPos != string::npos) {
weekday = atoi(timeCopy.substr(0,1).c_str()); const int weekday = std::stoi(timeCopy.substr(0, daySeperatorPos));
timeOffsetInDays = weekday - currTimeDate->getGmt()->tm_wday; timeOffsetInDays = weekday - currTimeDate->getGmt()->tm_wday;
timeCopy = timeCopy.substr(2,timeCopy.length()); timeCopy = theTime.substr(daySeperatorPos + 1);
} }
else
{
timeOffsetInDays = 0;
}
// TODO: verify status of each token.
if (timeCopy.length() < 8) {
SG_LOG( SG_AI, SG_WARN, "Timestring too short. " << theTime << " Defaulted to now" );
return currTimeDate->get_cur_time();
}
targetHour = atoi(timeCopy.substr(0,2).c_str());
targetMinute = atoi(timeCopy.substr(3,5).c_str());
targetSecond = atoi(timeCopy.substr(6,8).c_str());
targetTimeDate.tm_year = currTimeDate->getGmt()->tm_year;
targetTimeDate.tm_mon = currTimeDate->getGmt()->tm_mon;
targetTimeDate.tm_mday = currTimeDate->getGmt()->tm_mday;
targetTimeDate.tm_hour = targetHour;
targetTimeDate.tm_min = targetMinute;
targetTimeDate.tm_sec = targetSecond;
time_t processedTime = sgTimeGetGMT(&targetTimeDate); const auto timeTokens = simgear::strutils::split(timeCopy, ":");
processedTime += timeOffsetInDays*24*60*60; if (timeTokens.size() != 3) {
if (processedTime < currTimeDate->get_cur_time()) SG_LOG(SG_AI, SG_DEV_WARN, "FGScheduledFlight: Timestring too short. " << theTime << " Defaulted to now");
{ return currTimeDate->get_cur_time();
processedTime += repeatPeriod; }
targetHour = std::stoi(timeTokens.at(0));
targetMinute = std::stoi(timeTokens.at(1));
targetSecond = std::stoi(timeTokens.at(2));
targetTimeDate.tm_year = currTimeDate->getGmt()->tm_year;
targetTimeDate.tm_mon = currTimeDate->getGmt()->tm_mon;
targetTimeDate.tm_mday = currTimeDate->getGmt()->tm_mday;
targetTimeDate.tm_hour = targetHour;
targetTimeDate.tm_min = targetMinute;
targetTimeDate.tm_sec = targetSecond;
time_t processedTime = sgTimeGetGMT(&targetTimeDate);
processedTime += timeOffsetInDays * 24 * 60 * 60;
if (processedTime < currTimeDate->get_cur_time()) {
processedTime += repeatPeriod;
} }
//tm *temp = currTimeDate->getGmt(); //tm *temp = currTimeDate->getGmt();
//char buffer[512]; //char buffer[512];