diff --git a/code/meosversion.cpp b/code/meosversion.cpp index 57602cd..7bfdab8 100644 --- a/code/meosversion.cpp +++ b/code/meosversion.cpp @@ -27,9 +27,9 @@ //V2: ABCDEFGHIHJKMN //V31: a //V33: abcde -//V35: abcdefg +//V35: abcdefgh int getMeosBuild() { - string revision("$Rev: 804 $"); + string revision("$Rev: 810 $"); return 174 + atoi(revision.substr(5, string::npos).c_str()); } @@ -41,7 +41,7 @@ int getMeosBuild() { //V33: abcdefghij //V34: abcdfge wstring getMeosDate() { - wstring date(L"$Date: 2019-01-07 21:22:06 +0100 (må, 07 jan 2019) $"); + wstring date(L"$Date: 2019-01-10 22:42:30 +0100 (to, 10 jan 2019) $"); return date.substr(7,10); } diff --git a/code/oImportExport.cpp b/code/oImportExport.cpp index b121031..863d469 100644 --- a/code/oImportExport.cpp +++ b/code/oImportExport.cpp @@ -2310,7 +2310,7 @@ void oEvent::exportIOFResults(xmlparser &xml, bool selfContained, const set xml.startTag("SplitTime", "sequence", itos(no++)); xml.write("ControlCode", pcourse->Controls[k]->getFirstNumber()); if (unsigned(k)0) - xml.write("Time", "clockFormat", L"HH:MM:SS", getAbsTime((sp[k].time-it->tStartTime)-ZeroTime)); + xml.write("Time", "timeFormat", L"HH:MM:SS", formatTimeIOF(sp[k].time-it->tStartTime, 0)); else xml.write("Time", L"--:--:--"); @@ -2415,7 +2415,7 @@ void oEvent::exportIOFResults(xmlparser &xml, bool selfContained, const set xml.startTag("SplitTime", "sequence", itos(no++)); xml.write("ControlCode", pcourse->Controls[k]->getFirstNumber()); if (unsigned(k)0) - xml.write("Time", "timeFormat", L"HH:MM:SS", getAbsTime((sp[k].time-it->tStartTime)-ZeroTime)); + xml.write("Time", "timeFormat", L"HH:MM:SS", formatTimeIOF(sp[k].time - it->tStartTime, 0)); else xml.write("Time", L"--:--:--"); @@ -2567,7 +2567,7 @@ void oEvent::exportTeamSplits(xmlparser &xml, const set &classes, bool oldS xml.startTag("SplitTime", "sequence", itos(no++)); xml.write("ControlCode", pcourse->Controls[k]->getFirstNumber()); if (unsigned(k)0) - xml.write("Time", "clockFormat", L"HH:MM:SS", getAbsTime((sp[k].time-r->tStartTime)-ZeroTime)); + xml.write("Time", "timeFormat", L"HH:MM:SS", formatTimeIOF(sp[k].time - it->tStartTime, 0)); else xml.write("Time", L"--:--:--");