&ptr);
+ GeneralResultCtr() {}
+
+ ~GeneralResultCtr();
+ GeneralResultCtr(const GeneralResultCtr &ctr);
+ void operator=(const GeneralResultCtr &ctr);
+};
diff --git a/code/guihandler.h b/code/guihandler.h
index 55bec24..cc50c65 100644
--- a/code/guihandler.h
+++ b/code/guihandler.h
@@ -2,7 +2,7 @@
/************************************************************************
MeOS - Orienteering Software
- Copyright (C) 2009-2019 Melin Software HB
+ Copyright (C) 2009-2020 Melin Software HB
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/code/html1.htm b/code/html1.htm
index a2d5f9f..76a685a 100644
--- a/code/html1.htm
+++ b/code/html1.htm
@@ -429,13 +429,16 @@ This query is suitable for auto complete functionality.
card Card number.
-Returns:
-Status.
+Returns:
+Status.
+
+Note: If the card number is registered as a rental card, it will be set as such and
+ hiredCard will be set in the Fee attribute. The returned fee includes any rental card fee.
*Answer>
*Status>OK*/Status>
- *Fee>130*/Fee>
+ *Fee hiredCard="true">130*/Fee>
*Info>Open Long, Rudolf Minowski (OK Tisaren)*/Info>
*/Answer>
@@ -454,7 +457,6 @@ Status.
Returns:
Installed template file with the specified tag.
-
Image
Syntax:
/meos?image=*image>
diff --git a/code/image.cpp b/code/image.cpp
index 2472aef..512b431 100644
--- a/code/image.cpp
+++ b/code/image.cpp
@@ -1,6 +1,6 @@
/************************************************************************
MeOS - Orienteering Software
- Copyright (C) 2009-2019 Melin Software HB
+ Copyright (C) 2009-2020 Melin Software HB
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/code/image.h b/code/image.h
index c390f02..1bdff5c 100644
--- a/code/image.h
+++ b/code/image.h
@@ -1,6 +1,6 @@
/************************************************************************
MeOS - Orienteering Software
- Copyright (C) 2009-2019 Melin Software HB
+ Copyright (C) 2009-2020 Melin Software HB
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/code/importformats.cpp b/code/importformats.cpp
index 7ef0b26..2d597ac 100644
--- a/code/importformats.cpp
+++ b/code/importformats.cpp
@@ -1,6 +1,6 @@
/************************************************************************
MeOS - Orienteering Software
- Copyright (C) 2009-2019 Melin Software HB
+ Copyright (C) 2009-2020 Melin Software HB
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/code/infoserver.cpp b/code/infoserver.cpp
index 1d41f41..bb179db 100644
--- a/code/infoserver.cpp
+++ b/code/infoserver.cpp
@@ -1,6 +1,6 @@
/************************************************************************
MeOS - Orienteering Software
- Copyright (C) 2009-2019 Melin Software HB
+ Copyright (C) 2009-2020 Melin Software HB
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -488,10 +488,14 @@ bool InfoBaseCompetitor::synchronizeBase(oAbstractRunner &bc) {
ch = true;
}
- int s = bc.getStatus();
- int rt = bc.getRunningTime() * 10;
- if (rt > 0 && s == RunnerStatus::StatusUnknown)
- s = RunnerStatus::StatusOK;
+ RunnerStatus s = bc.getStatus();
+ int rt = bc.getRunningTime(true) * 10;
+ if (rt > 0) {
+ if (s == RunnerStatus::StatusUnknown)
+ s = RunnerStatus::StatusOK;
+ }
+ else if (isPossibleResultStatus(s))
+ s = StatusUnknown;
if (status != s) {
status = s;
@@ -547,8 +551,8 @@ bool InfoCompetitor::synchronize(bool useTotalResults, bool useCourse, oRunner &
s = r.getTotalStatusInput();
}
else if (t && !isQF && r.getLegNumber() > 0) {
- legInput = t->getLegRunningTime(r.getLegNumber() - 1, false) * 10;
- s = t->getLegStatus(r.getLegNumber() - 1, false);
+ legInput = t->getLegRunningTime(r.getLegNumber() - 1, true, false) * 10;
+ s = t->getLegStatus(r.getLegNumber() - 1, true, false);
}
if (totalStatus != s) {
@@ -569,9 +573,29 @@ bool InfoCompetitor::synchronize(bool useTotalResults, bool useCourse, oRunner &
bool InfoCompetitor::synchronize(const InfoCompetition &cmp, oRunner &r) {
bool useTotalResults = cmp.includeTotalResults();
bool inludeCourse = cmp.includeCourse();
-
bool ch = synchronize(useTotalResults, inludeCourse, r);
+ int cno = r.getCardNo();
+ if (cno != cardNo) {
+ cardNo = cno;
+ changeCard = true;
+ ch = true;
+ }
+
+ bool nr;
+ if ((r.getStatus() == StatusUnknown || r.getStatus() == StatusOutOfCompetition || r.getStatus() == StatusNoTiming) && r.getFinishTime() <= 0) {
+ vector pv;
+ r.getEvent()->getPunchesForRunner(r.getId(), false, pv);
+ nr = pv.size() > 0;
+ }
+ else {
+ nr = false;
+ }
+ if (isRunning != nr) {
+ isRunning = nr;
+ ch = true;
+ }
+
vector newRT;
if (r.getClassId(false) > 0) {
const vector &radios = cmp.getControls(r.getClassId(true), r.getLegNumber());
@@ -601,7 +625,16 @@ bool InfoCompetitor::synchronize(const InfoCompetition &cmp, oRunner &r) {
void InfoCompetitor::serialize(xmlbuffer &xml, bool diffOnly) const {
vector< pair > sprop;
- sprop.push_back(make_pair("id", itow(getId())));
+ sprop.reserve(3);
+ sprop.emplace_back("id", itow(getId()));
+
+ if (changeCard || !diffOnly) {
+ sprop.emplace_back("card", itow(cardNo));
+ changeCard = false;
+ }
+ if (isRunning)
+ sprop.emplace_back("competing", L"true");
+
xmlbuffer &subTag = xml.startTag("cmp", sprop);
InfoBaseCompetitor::serialize(subTag, diffOnly, course);
@@ -627,7 +660,6 @@ void InfoCompetitor::serialize(xmlbuffer &xml, bool diffOnly) const {
xml.endTag();
}
-
bool InfoTeam::synchronize(oTeam &t) {
bool ch = synchronizeBase(t);
diff --git a/code/infoserver.h b/code/infoserver.h
index 5392176..b804aa3 100644
--- a/code/infoserver.h
+++ b/code/infoserver.h
@@ -1,6 +1,6 @@
/************************************************************************
MeOS - Orienteering Software
- Copyright (C) 2009-2019 Melin Software HB
+ Copyright (C) 2009-2020 Melin Software HB
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -182,9 +182,12 @@ class InfoCompetitor : public InfoBaseCompetitor {
int inputTime;
int totalStatus;
int course;
+ int cardNo = 0;
+ bool isRunning = false;
bool synchronize(const InfoCompetition &cmp, oRunner &c);
bool changeTotalSt;
bool changeRadio;
+ mutable bool changeCard = false;
public:
bool synchronize(bool useTotalResults, bool useCourse, oRunner &c);
void serialize(xmlbuffer &xml, bool diffOnly) const;
diff --git a/code/inthashmap.h b/code/inthashmap.h
index 5b01b25..22c487c 100644
--- a/code/inthashmap.h
+++ b/code/inthashmap.h
@@ -2,7 +2,7 @@
/************************************************************************
MeOS - Orienteering Software
- Copyright (C) 2009-2019 Melin Software HB
+ Copyright (C) 2009-2020 Melin Software HB
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/code/intkeymap.hpp b/code/intkeymap.hpp
index 1db8275..07a4982 100644
--- a/code/intkeymap.hpp
+++ b/code/intkeymap.hpp
@@ -1,7 +1,7 @@
#pragma once
/************************************************************************
MeOS - Orienteering Software
- Copyright (C) 2009-2019 Melin Software HB
+ Copyright (C) 2009-2020 Melin Software HB
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/code/intkeymapimpl.hpp b/code/intkeymapimpl.hpp
index 73c0156..a821069 100644
--- a/code/intkeymapimpl.hpp
+++ b/code/intkeymapimpl.hpp
@@ -2,7 +2,7 @@
/************************************************************************
MeOS - Orienteering Software
- Copyright (C) 2009-2019 Melin Software HB
+ Copyright (C) 2009-2020 Melin Software HB
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/code/iof30interface.cpp b/code/iof30interface.cpp
index be54c42..69b5fac 100644
--- a/code/iof30interface.cpp
+++ b/code/iof30interface.cpp
@@ -1,6 +1,6 @@
/************************************************************************
MeOS - Orienteering Software
- Copyright (C) 2009-2019 Melin Software HB
+ Copyright (C) 2009-2020 Melin Software HB
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -1236,7 +1236,8 @@ void IOF30Interface::readEvent(gdioutput &gdi, const xmlobject &xo,
wstring name;
xo.getObjectString("Name", name);
- oe.setName(name);
+ if (!oe.hasFlag(oEvent::TransferFlags::FlagManualName))
+ oe.setName(name, false);
int id = xo.getObjectInt("Id");
if (id>0) {
@@ -1264,11 +1265,13 @@ void IOF30Interface::readEvent(gdioutput &gdi, const xmlobject &xo,
int zt = t - 3600;
if (zt < 0)
zt += 3600*24;
- oe.setZeroTime(formatTimeHMS(zt));
+
+ if (!oe.hasFlag(oEvent::TransferFlags::FlagManualDateTime))
+ oe.setZeroTime(formatTimeHMS(zt), false);
}
}
-
- oe.setDate(dateStr);
+ if (!oe.hasFlag(oEvent::TransferFlags::FlagManualDateTime))
+ oe.setDate(dateStr, false);
//oe.setZeroTime(...);
}
@@ -1425,16 +1428,16 @@ pTeam IOF30Interface::readTeamEntry(gdioutput &gdi, xmlobject &xTeam,
if (!matchStageFilter(stageFilter, races))
return 0;
- bool newTeam;
- pTeam t = getCreateTeam(gdi, xTeam, newTeam);
-
- if (!t)
- return 0;
-
// Class
map > localTeamClassConfig;
pClass pc = readClass(xTeam.getObject("Class"), localTeamClassConfig);
+ bool newTeam;
+ pTeam t = getCreateTeam(gdi, xTeam, pc ? pc->getId() : 0, newTeam);
+
+ if (!t)
+ return 0;
+
if (pc && (t->getClassId(false) == 0 || !t->hasFlag(oAbstractRunner::FlagUpdateClass)) ) {
t->setClassId(pc->getId(), false);
}
@@ -1443,11 +1446,11 @@ pTeam IOF30Interface::readTeamEntry(gdioutput &gdi, xmlobject &xTeam,
wchar_t pat[32];
int no = oClass::extractBibPattern(bib, pat);
if (no > 0 && t->getBib().empty())
- t->setBib(bib, no, true, false);
+ t->setBib(bib, no, true);
else if (newTeam) {
pair autoBib = pc->getNextBib(bibPatterns);
if (autoBib.first > 0) {
- t->setBib(autoBib.second, autoBib.first, true, false);
+ t->setBib(autoBib.second, autoBib.first, true);
}
}
@@ -1486,8 +1489,8 @@ pTeam IOF30Interface::readTeamEntry(gdioutput &gdi, xmlobject &xTeam,
for (size_t k = 0; ksynchronize();
+ t->applyBibs();
+ t->evaluate(oBase::ChangeType::Update);
return t;
}
@@ -1495,7 +1498,7 @@ pTeam IOF30Interface::readTeamStart(gdioutput &gdi, pClass pc, xmlobject &xTeam,
map > &bibPatterns,
const map > &teamClassConfig) {
bool newTeam;
- pTeam t = getCreateTeam(gdi, xTeam, newTeam);
+ pTeam t = getCreateTeam(gdi, xTeam, pc ? pc->getId() : 0, newTeam);
if (!t)
return 0;
@@ -1509,11 +1512,11 @@ pTeam IOF30Interface::readTeamStart(gdioutput &gdi, pClass pc, xmlobject &xTeam,
wchar_t pat[32];
int no = oClass::extractBibPattern(bib, pat);
if (no > 0 && t->getBib().empty())
- t->setBib(bib, no, true, false);
+ t->setBib(bib, no, true);
else if (newTeam){
pair autoBib = pc->getNextBib(bibPatterns);
if (autoBib.first > 0) {
- t->setBib(autoBib.second, autoBib.first, true, false);
+ t->setBib(autoBib.second, autoBib.first, true);
}
}
xmlList xEntries;
@@ -1522,12 +1525,12 @@ pTeam IOF30Interface::readTeamStart(gdioutput &gdi, pClass pc, xmlobject &xTeam,
for (size_t k = 0; ksynchronize();
+ t->applyBibs();
+ t->evaluate(oBase::ChangeType::Update);
return t;
}
-pTeam IOF30Interface::getCreateTeam(gdioutput &gdi, const xmlobject &xTeam, bool &newTeam) {
+pTeam IOF30Interface::getCreateTeam(gdioutput &gdi, const xmlobject &xTeam, int expectedClassId, bool &newTeam) {
newTeam = false;
wstring name;
xTeam.getObjectString("Name", name);
@@ -1542,7 +1545,8 @@ pTeam IOF30Interface::getCreateTeam(gdioutput &gdi, const xmlobject &xTeam, bool
t = oe.getTeam(id);
else {
t = oe.getTeamByName(name);
- // XXX Check class
+ if (t && expectedClassId > 0 && t->getClassId(false) != expectedClassId)
+ t = nullptr;
}
if (!t) {
if (id > 0) {
@@ -1825,7 +1829,7 @@ pRunner IOF30Interface::readPersonStart(gdioutput &gdi, pClass pc, xmlobject &xo
starts[k].getObjectString("BibNumber", bib);
rRace->getDI().setString("Bib", bib);
- rRace->setStartTime(parseISO8601Time(startTime), true, false);
+ rRace->setStartTime(parseISO8601Time(startTime), true, oBase::ChangeType::Update);
}
}
@@ -2301,14 +2305,15 @@ pClass IOF30Interface::readClass(const xmlobject &xclass,
pc = oe.addClass(name);
oDataInterface DI = pc->getDI();
-
- if (!longName.empty()) {
- pc->setName(name);
- DI.setString("LongName", longName);
- }
- else {
- if (pc->getName() != name && DI.getString("LongName") != name)
- pc->setName(name);
+ if (!pc->hasFlag(oClass::TransferFlags::FlagManualName)) {
+ if (!longName.empty()) {
+ pc->setName(name, false);
+ DI.setString("LongName", longName);
+ }
+ else {
+ if (pc->getName() != name && DI.getString("LongName") != name)
+ pc->setName(name, false);
+ }
}
xmlList legs;
xclass.getObjects("Leg", legs);
@@ -2666,46 +2671,8 @@ void IOF30Interface::writeResultList(xmlparser &xml, const set &classes,
oe.getClasses(c, false);
for (size_t k = 0; k < c.size(); k++) {
-// bool indRel = c[k]->getClassType() == oClassIndividRelay;
if (classes.empty() || classes.count(c[k]->getId())) {
- /* oe.getRunners(c[k]->getId(), r, false);
- vector rToUse;
- rToUse.reserve(r.size());
-
- for (size_t j = 0; j < r.size(); j++) {
- if (leg == -1 || leg == r[j]->getLegNumber()) {
- if (leg == -1 && indRel && r[j]->getLegNumber() != 0)
- continue; // Skip all but leg 0 for individual relay
-
- if (leg == -1 && !indRel && r[j]->getTeam())
- continue; // For teams, skip presonal results, unless individual relay
-
- if (r[j]->getStatus() == StatusUnknown)
- continue;
-
- rToUse.push_back(r[j]);
- }
- }
-
- vector tToUse;
-
- if (leg == -1) {
- oe.getTeams(c[k]->getId(), t, false);
- tToUse.reserve(t.size());
-
- for (size_t j = 0; j < t.size(); j++) {
- for (int n = 0; n < t[j]->getNumRunners(); n++) {
- pRunner tr = t[j]->getRunner(n);
- if (tr && tr->getStatus() != StatusUnknown) {
- tToUse.push_back(t[j]);
- break;
- }
- }
- }
-
- }
- */
vector rToUse;
vector tToUse;
getRunnersToUse(c[k], rToUse, tToUse, leg, false);
@@ -2716,7 +2683,6 @@ void IOF30Interface::writeResultList(xmlparser &xml, const set &classes,
}
}
-
xml.endTag();
}
@@ -2801,8 +2767,11 @@ void IOF30Interface::writeCourseInfo(xmlparser &xml, const oCourse &c) {
}
-wstring formatStatus(RunnerStatus st) {
+wstring formatStatus(RunnerStatus st, bool hasTime) {
switch (st) {
+ case StatusNoTiming:
+ if (!hasTime)
+ break;
case StatusOK:
return L"OK";
case StatusDNS:
@@ -2817,11 +2786,13 @@ wstring formatStatus(RunnerStatus st) {
return L"Disqualified";
case StatusMAX:
return L"OverTime";
+ case StatusOutOfCompetition:
+ if (!hasTime)
+ break;
case StatusNotCompetiting:
return L"NotCompeting";
- default:
- return L"Inactive";
}
+ return L"Inactive";
}
void IOF30Interface::writePersonResult(xmlparser &xml, const oRunner &r,
@@ -2890,6 +2861,8 @@ void IOF30Interface::writeResult(xmlparser &xml, const oRunner &rPerson, const o
if (teamMember)
writeLegOrder(xml, rPerson.getClassRef(false), rPerson.getLegNumber());
+ bool patrolResult = r.getTeam() && r.getClassRef(false)->getClassType() == oClassPatrol && !teamsAsIndividual;
+
wstring bib = rPerson.getBib();
if (!bib.empty())
xml.write("BibNumber", bib);
@@ -2897,21 +2870,47 @@ void IOF30Interface::writeResult(xmlparser &xml, const oRunner &rPerson, const o
if (r.getStartTime() > 0)
xml.write("StartTime", oe.getAbsDateTimeISO(r.getStartTime(), true, useGMT));
+ int finishTime, runningTime, place, after;
+ RunnerStatus status;
+ if (!patrolResult) {
+ place = r.getPlace();
+ finishTime = r.getFinishTimeAdjusted();
+ runningTime = r.getRunningTime(true);
+ after = r.getTimeAfter();
+ status = r.getStatusComputed();
+ }
+ else {
+ int pl = r.getParResultLeg();
+ place = r.getTeam()->getLegPlace(pl, false);
+ runningTime = r.getTeam()->getLegRunningTime(pl, true, false);
+ if (runningTime > 0)
+ finishTime = r.getStartTime() + runningTime;
+ else
+ finishTime = 0;
+
+ after = r.getTeam()->getTimeAfter(pl);
+ status = r.getTeam()->getLegStatus(pl, true, false);
+ }
+
+ if ((r.getClassRef(false) && r.getClassRef(true)->getNoTiming()) ||
+ r.getStatusComputed() == StatusNoTiming) {
+ after = -1;
+ runningTime = 0;
+ }
+
if (r.getFinishTime() > 0)
- xml.write("FinishTime", oe.getAbsDateTimeISO(r.getFinishTimeAdjusted(), true, useGMT));
+ xml.write("FinishTime", oe.getAbsDateTimeISO(finishTime, true, useGMT));
- if (r.getRunningTime() > 0)
- xml.write("Time", r.getRunningTime());
+ if (runningTime > 0)
+ xml.write("Time", runningTime);
- int after = r.getTimeAfter();
if (after >= 0) {
if (teamMember) {
xml.write("TimeBehind", "type", L"Leg", itow(after));
- after = r.getTimeAfterCourse();
- if (after >= 0)
- xml.write("TimeBehind", "type", L"Course", itow(after));
-
+ int afterCourse = r.getTimeAfterCourse();
+ if (afterCourse >= 0)
+ xml.write("TimeBehind", "type", L"Course", itow(afterCourse));
}
else
xml.write("TimeBehind", after);
@@ -2919,27 +2918,26 @@ void IOF30Interface::writeResult(xmlparser &xml, const oRunner &rPerson, const o
if (r.getClassRef(false)) {
- if (r.statusOK() && r.getClassRef(false)->getNoTiming() == false) {
- if (!teamMember && r.getPlace() > 0 && r.getPlace() < 50000) {
- xml.write("Position", r.getPlace());
+ if (r.statusOK(true) && r.getClassRef(false)->getNoTiming() == false) {
+ if (!teamMember && place > 0 && place < 50000) {
+ xml.write("Position", place);
}
else if (teamMember) {
- int pos = r.getPlace();
- if (pos > 0 && pos < 50000)
- xml.write("Position", "type", L"Leg", itow(pos));
+ if (place > 0 && place < 50000)
+ xml.write("Position", "type", L"Leg", itow(place));
- pos = r.getCoursePlace();
- if (pos > 0)
- xml.write("Position", "type", L"Course", itow(pos));
+ int placeCourse = r.getCoursePlace(true);
+ if (placeCourse > 0)
+ xml.write("Position", "type", L"Course", itow(placeCourse));
}
}
- xml.write("Status", formatStatus(r.getStatus()));
+ xml.write("Status", formatStatus(status, r.getFinishTime()>0));
- int rg = r.getRogainingPoints(false);
+ int rg = r.getRogainingPoints(true, false);
if (rg > 0) {
xml.write("Score", "type", L"Score", itow(rg));
- xml.write("Score", "type", L"Penalty", itow(r.getRogainingReduction()));
+ xml.write("Score", "type", L"Penalty", itow(r.getRogainingReduction(true)));
}
if ( (r.getTeam() && r.getClassRef(false)->getClassType() != oClassPatrol && !teamsAsIndividual) || hasInputTime) {
xml.startTag("OverallResult");
@@ -2953,7 +2951,7 @@ void IOF30Interface::writeResult(xmlparser &xml, const oRunner &rPerson, const o
int tleg = r.getLegNumber() >= 0 ? r.getLegNumber() : 0;
if (stat == StatusOK && hasTiming) {
- int after = r.getTotalRunningTime() - r.getClassRef(true)->getTotalLegLeaderTime(tleg, true);
+ int after = r.getTotalRunningTime() - r.getClassRef(true)->getTotalLegLeaderTime(tleg, true, true);
if (after >= 0)
xml.write("TimeBehind", after);
}
@@ -2961,7 +2959,7 @@ void IOF30Interface::writeResult(xmlparser &xml, const oRunner &rPerson, const o
if (stat == StatusOK && hasTiming)
xml.write("Position", r.getTotalPlace());
- xml.write("Status", formatStatus(stat));
+ xml.write("Status", formatStatus(stat, r.getFinishTime() > 0));
xml.endTag();
}
@@ -2972,9 +2970,10 @@ void IOF30Interface::writeResult(xmlparser &xml, const oRunner &rPerson, const o
writeCourse(xml, *crs);
const vector &sp = r.getSplitTimes(doUnroll);
- if (r.getStatus()>0 && r.getStatus() != StatusDNS &&
- r.getStatus() != StatusCANCEL &&
- r.getStatus() != StatusNotCompetiting) {
+ RunnerStatus st = r.getStatusComputed();
+ if (r.getStatus()>0 && st != StatusDNS &&
+ st != StatusCANCEL &&
+ st != StatusNotCompetiting) {
int nc = crs->getNumControls();
bool hasRogaining = crs->hasRogaining();
int firstControl = crs->useFirstAsStart() ? 1 : 0;
@@ -3264,7 +3263,7 @@ void IOF30Interface::getRunnersToUse(const pClass cls, vector &rToUse,
if (leg == -1 && !indRel && r[j]->getTeam())
continue; // For teams, skip presonal results, unless individual relay
- if (!includeUnknown && r[j]->getStatus() == StatusUnknown)
+ if (!includeUnknown && !r[j]->hasResult())
continue;
}
rToUse.push_back(r[j]);
@@ -3281,7 +3280,7 @@ void IOF30Interface::getRunnersToUse(const pClass cls, vector &rToUse,
else {
for (int n = 0; n < t[j]->getNumRunners(); n++) {
pRunner tr = t[j]->getRunner(n);
- if (tr && tr->getStatus() != StatusUnknown) {
+ if (tr && tr->hasResult()) {
tToUse.push_back(t[j]);
break;
}
diff --git a/code/iof30interface.h b/code/iof30interface.h
index 637785e..4f07eda 100644
--- a/code/iof30interface.h
+++ b/code/iof30interface.h
@@ -1,6 +1,6 @@
/************************************************************************
MeOS - Orienteering Software
- Copyright (C) 2009-2019 Melin Software HB
+ Copyright (C) 2009-2020 Melin Software HB
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -163,7 +163,7 @@ class IOF30Interface {
map > &bibPatterns,
const map > &teamClassConfig);
- pTeam getCreateTeam(gdioutput &gdi, const xmlobject &xTeam, bool &newTeam);
+ pTeam getCreateTeam(gdioutput &gdi, const xmlobject &xTeam, int expectedClassId, bool &newTeam);
static int getIndexFromLegPos(int leg, int legorder, const vector &setup);
diff --git a/code/license.txt b/code/license.txt
index 5f4e616..6754e03 100644
--- a/code/license.txt
+++ b/code/license.txt
@@ -7,7 +7,7 @@ Third Party Code. Additional copyright notices and license terms applicable to p
All trademarks and registered trademarks mentioned herein are the property of their respective owners.
------------------------------------
-Copyright 2007-2019 Melin Software HB.
+Copyright 2007-2020 Melin Software HB.
------------------------------------
diff --git a/code/listeditor.cpp b/code/listeditor.cpp
index 381c0f1..3697e46 100644
--- a/code/listeditor.cpp
+++ b/code/listeditor.cpp
@@ -1,6 +1,6 @@
/************************************************************************
MeOS - Orienteering Software
- Copyright (C) 2009-2019 Melin Software HB
+ Copyright (C) 2009-2020 Melin Software HB
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -34,6 +34,7 @@
#include "oEvent.h"
#include "tabbase.h"
#include "CommDlg.h"
+#include "generalresult.h"
ListEditor::ListEditor(oEvent *oe_) {
oe = oe_;
@@ -42,7 +43,7 @@ ListEditor::ListEditor(oEvent *oe_) {
dirtyExt = false;
dirtyInt = false;
lastSaved = NotSaved;
- oe->loadGeneralResults(false);
+ oe->loadGeneralResults(false, true);
}
ListEditor::~ListEditor() {
@@ -78,6 +79,13 @@ void ListEditor::load(const MetaListContainer &mlc, int index) {
savedFileName.clear();
}
+void ListEditor::show(TabBase *dst, gdioutput &gdi) {
+
+ gdi.clearPage(false);
+ origin = dst;
+ show(gdi);
+}
+
void ListEditor::show(gdioutput &gdi) {
gdi.setRestorePoint("BeginListEdit");
@@ -452,7 +460,7 @@ int ListEditor::editList(gdioutput &gdi, int type, BaseInfo &data) {
else
mlp.setLeg(-1);
- if (gdi.hasField("UseResultModule") && gdi.isChecked("UseResultModule"))
+ if (gdi.hasWidget("UseResultModule") && gdi.isChecked("UseResultModule"))
mlp.setResultModule(currentList->getResultModule());
else
mlp.setResultModule("");
@@ -604,7 +612,7 @@ int ListEditor::editList(gdioutput &gdi, int type, BaseInfo &data) {
lastSaved = SavedFile;
savedFileName = fileName;
- oe->loadGeneralResults(true);
+ oe->loadGeneralResults(true, true);
makeDirty(gdi, ClearDirty, ClearDirty);
show(gdi);
}
@@ -700,7 +708,12 @@ int ListEditor::editList(gdioutput &gdi, int type, BaseInfo &data) {
makeDirty(gdi, ClearDirty, ClearDirty);
currentIndex = -1;
savedFileName.clear();
- gdi.getTabs().get(TListTab)->loadPage(gdi);
+
+ if (origin) {
+ auto oc = origin;
+ origin = nullptr;
+ oc->loadPage(gdi);
+ }
return 0;
}
/*else if (bi.id == "BrowseFont") {
@@ -732,9 +745,12 @@ int ListEditor::editList(gdioutput &gdi, int type, BaseInfo &data) {
if (type == lResultModuleNumber || type == lResultModuleTime ||
type == lResultModuleNumberTeam || type == lResultModuleTimeTeam) {
gdi.check("UseLeg", true);
- gdi.check("UseResultModule", true);
- gdi.disableInput("UseResultModule");
gdi.disableInput("UseLeg");
+
+ if (gdi.hasWidget("UseResultModule")) {
+ gdi.check("UseResultModule", true);
+ gdi.disableInput("UseResultModule");
+ }
gdi.enableInput("Leg");
if (gdi.getText("Leg").empty())
gdi.setText("Leg", L"0");
@@ -887,9 +903,11 @@ void ListEditor::editListPost(gdioutput &gdi, const MetaListPost &mlp, int id) {
if (storedType == lResultModuleNumber || storedType == lResultModuleTime || storedType == lResultModuleTimeTeam || storedType == lResultModuleNumberTeam) {
gdi.check("UseLeg", true);
- gdi.check("UseResultModule", true);
- gdi.disableInput("UseResultModule");
gdi.disableInput("UseLeg");
+ if (gdi.hasWidget("UseResultModule")) {
+ gdi.check("UseResultModule", true);
+ gdi.disableInput("UseResultModule");
+ }
}
gdi.dropLine(2);
@@ -1174,11 +1192,11 @@ void ListEditor::makeDirty(gdioutput &gdi, DirtyFlag inside, DirtyFlag outside)
else if (outside == ClearDirty)
dirtyExt = false;
- if (gdi.hasField("SaveInside")) {
+ if (gdi.hasWidget("SaveInside")) {
gdi.setInputStatus("SaveInside", dirtyInt || lastSaved != SavedInside);
}
- if (gdi.hasField("SaveFile")) {
+ if (gdi.hasWidget("SaveFile")) {
gdi.setInputStatus("SaveFile", dirtyExt || lastSaved != SavedFile);
}
}
diff --git a/code/listeditor.h b/code/listeditor.h
index d004258..aeabdb9 100644
--- a/code/listeditor.h
+++ b/code/listeditor.h
@@ -2,7 +2,7 @@
/************************************************************************
MeOS - Orienteering Software
- Copyright (C) 2009-2019 Melin Software HB
+ Copyright (C) 2009-2020 Melin Software HB
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -30,6 +30,8 @@ class BaseInfo;
class ButtonInfo;
class oEvent;
enum EPostType;
+class TabBase;
+
#include
class ListEditor {
@@ -65,6 +67,10 @@ private:
void enableOpen(gdioutput &gdi);
void makeDirty(gdioutput &gdi, DirtyFlag inside, DirtyFlag outside);
+
+ TabBase *origin = nullptr;
+ void show(gdioutput &gdi);
+
public:
ListEditor(oEvent *oe);
virtual ~ListEditor();
@@ -72,7 +78,9 @@ public:
//void load(MetaList *list);
void load(const MetaListContainer &mlc, int index);
- void show(gdioutput &gdi);
+ void show(TabBase *dst, gdioutput &gdi);
+
+ bool isShown(TabBase *tab) const { return origin == tab; }
MetaList *getCurrentList() const {return currentList;};
diff --git a/code/liveresult.cpp b/code/liveresult.cpp
index 50fab00..f77d8d3 100644
--- a/code/liveresult.cpp
+++ b/code/liveresult.cpp
@@ -1,6 +1,6 @@
/********************i****************************************************
MeOS - Orienteering Software
- Copyright (C) 2009-2019 Melin Software HB
+ Copyright (C) 2009-2020 Melin Software HB
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -284,7 +284,7 @@ void LiveResult::handle(gdioutput &gdi, BaseInfo &bu, GuiEventType type) {
pRunner r = oe->getRunner(rToWatch[i], 0);
if (r) {
r->synchronize();
- r->setStartTime(st, true, false, true);
+ r->setStartTime(st, true, oBase::ChangeType::Update, true);
r->synchronize(false);
}
}
diff --git a/code/liveresult.h b/code/liveresult.h
index f20d847..dc88b07 100644
--- a/code/liveresult.h
+++ b/code/liveresult.h
@@ -1,7 +1,7 @@
#pragma once
/************************************************************************
MeOS - Orienteering Software
- Copyright (C) 2009-2019 Melin Software HB
+ Copyright (C) 2009-2020 Melin Software HB
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/code/localizer.cpp b/code/localizer.cpp
index a344784..d86c6e4 100644
--- a/code/localizer.cpp
+++ b/code/localizer.cpp
@@ -1,6 +1,6 @@
/************************************************************************
MeOS - Orienteering Software
- Copyright (C) 2009-2019 Melin Software HB
+ Copyright (C) 2009-2020 Melin Software HB
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/code/localizer.h b/code/localizer.h
index 5b00ad8..85aab30 100644
--- a/code/localizer.h
+++ b/code/localizer.h
@@ -1,7 +1,7 @@
#pragma once
/************************************************************************
MeOS - Orienteering Software
- Copyright (C) 2009-2019 Melin Software HB
+ Copyright (C) 2009-2020 Melin Software HB
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/code/meos.cpp b/code/meos.cpp
index 63bb34d..4fb53eb 100644
--- a/code/meos.cpp
+++ b/code/meos.cpp
@@ -1,6 +1,6 @@
/************************************************************************
MeOS - Orienteering Software
- Copyright (C) 2009-2019 Melin Software HB
+ Copyright (C) 2009-2020 Melin Software HB
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -67,6 +67,7 @@
#include "autocomplete.h"
#include "image.h"
#include "csvparser.h"
+#include "generalresult.h"
int defaultCodePage = 1252;
@@ -221,17 +222,26 @@ int APIENTRY WinMain(HINSTANCE hInstance,
RunnerStatusOrderMap[k] = 0;
}
RunnerStatusOrderMap[StatusOK] = 0;
- RunnerStatusOrderMap[StatusMAX] = 1;
- RunnerStatusOrderMap[StatusMP] = 2;
- RunnerStatusOrderMap[StatusDNF] = 3;
- RunnerStatusOrderMap[StatusDQ] = 4;
- RunnerStatusOrderMap[StatusCANCEL] = 5;
- RunnerStatusOrderMap[StatusDNS] = 6;
- RunnerStatusOrderMap[StatusUnknown] = 7;
- RunnerStatusOrderMap[StatusNotCompetiting] = 8;
+ RunnerStatusOrderMap[StatusNoTiming] = 1;
+ RunnerStatusOrderMap[StatusOutOfCompetition] = 2;
+
+ RunnerStatusOrderMap[StatusMAX] = 3;
+ RunnerStatusOrderMap[StatusMP] = 4;
+ RunnerStatusOrderMap[StatusDNF] = 5;
+ RunnerStatusOrderMap[StatusDQ] = 6;
+ RunnerStatusOrderMap[StatusCANCEL] = 7;
+ RunnerStatusOrderMap[StatusDNS] = 8;
+ RunnerStatusOrderMap[StatusUnknown] = 9;
+ RunnerStatusOrderMap[StatusNotCompetiting] = 10;
lang.init();
StringCache::getInstance().init();
+
+ for (RunnerStatus st : getAllRunnerStatus()) {
+ if (st != StatusOK)
+ assert(RunnerStatusOrderMap[st] > 0);
+ oAbstractRunner::encodeStatus(st);
+ }
GetCurrentDirectory(MAX_PATH, programPath);
bool utfRecode = false;
@@ -469,14 +479,14 @@ int APIENTRY WinMain(HINSTANCE hInstance,
}
}
}
-
+ gdi_main = nullptr;
gdi_extra.clear();
if (gEvent)
gEvent->saveProperties(settings);
delete gEvent;
- gEvent = 0;
+ gEvent = nullptr;
initMySQLCriticalSection(false);
diff --git a/code/meos.rc b/code/meos.rc
index d0cc44d..631bfdf 100644
--- a/code/meos.rc
+++ b/code/meos.rc
@@ -169,7 +169,7 @@ BEGIN
VALUE "FileDescription", "meos"
VALUE "FileVersion", "3.3.0.1"
VALUE "InternalName", "meos"
- VALUE "LegalCopyright", "Copyright © 2007-2019"
+ VALUE "LegalCopyright", "Copyright © 2007-2020"
VALUE "OriginalFilename", "meos.exe"
VALUE "ProductName", " meos"
VALUE "ProductVersion", "3.4.0.1"
diff --git a/code/meos_util.cpp b/code/meos_util.cpp
index 7b28af5..bce3454 100644
--- a/code/meos_util.cpp
+++ b/code/meos_util.cpp
@@ -1,6 +1,6 @@
/************************************************************************
MeOS - Orienteering Software
- Copyright (C) 2009-2019 Melin Software HB
+ Copyright (C) 2009-2020 Melin Software HB
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -2212,3 +2212,8 @@ void checkWriteAccess(const wstring &file) {
}
CloseHandle(h);
}
+
+int compareStringIgnoreCase(const wstring &a, const wstring &b) {
+ return CompareString(LOCALE_USER_DEFAULT, NORM_IGNORECASE, a.c_str(), a.length(),
+ b.c_str(), b.length()) - CSTR_EQUAL;
+}
diff --git a/code/meos_util.h b/code/meos_util.h
index 9b58a2d..4363cc0 100644
--- a/code/meos_util.h
+++ b/code/meos_util.h
@@ -1,6 +1,6 @@
/************************************************************************
MeOS - Orienteering Software
- Copyright (C) 2009-2019 Melin Software HB
+ Copyright (C) 2009-2020 Melin Software HB
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -119,6 +119,9 @@ const vector &split(const string &line, const string &separators, vector
const vector &split(const wstring &line, const wstring &separators, vector &split_vector);
const wstring &unsplit(const vector &split_vector, const wstring &separators, wstring &line);
+// Compare two strings, ignore case. 0 = equal, != zero compares as the integers.
+int compareStringIgnoreCase(const wstring &a, const wstring &b);
+
const wstring &makeDash(const wstring &t);
const wstring &makeDash(const wchar_t *t);
diff --git a/code/meosdb/MeosSQL.cpp b/code/meosdb/MeosSQL.cpp
index 53a3d6a..8a879fd 100644
--- a/code/meosdb/MeosSQL.cpp
+++ b/code/meosdb/MeosSQL.cpp
@@ -1,6 +1,6 @@
/************************************************************************
MeOS - Orienteering Software
- Copyright (C) 2009-2019 Melin Software HB
+ Copyright (C) 2009-2020 Melin Software HB
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -37,6 +37,7 @@
#include "../metalist.h"
#include "../MeOSFeatures.h"
#include "../meosexception.h"
+#include "../generalresult.h"
using namespace mysqlpp;
@@ -394,7 +395,7 @@ void MeosSQL::upgradeDB(const string &db, oDataContainer const * dc) {
if (!eCol.count("InputTime")) {
string sql = "ALTER TABLE " + db + " ";
sql += "ADD COLUMN " + C_INT("InputTime");
- sql += "ADD COLUMN " + C_INT("InputStatus");
+ sql += "ADD COLUMN InputStatus INT NOT NULL DEFAULT 1, ";
sql += "ADD COLUMN " + C_INT("InputPoints");
sql += "ADD COLUMN " + C_INT("InputPlace");
sql = sql.substr(0, sql.length() - 2);
@@ -715,7 +716,6 @@ OpFailStatus MeosSQL::SyncUpdate(oEvent *oe)
<< " WHERE Id=" << oe->Id;
queryset.execute();
- //syncUpdate(queryset, "oEvent", oe, true);
}
catch (const mysqlpp::Exception& er){
setDefaultDB();
@@ -1126,7 +1126,7 @@ OpFailStatus MeosSQL::SyncRead(oEvent *oe) {
}
pw.setProgress(20);
-
+ oe->sqlClubs.reset();
try {
ResUse res = query.use("SELECT * FROM oClub WHERE Removed=0");
@@ -1139,9 +1139,7 @@ OpFailStatus MeosSQL::SyncRead(oEvent *oe) {
oClub c(oe, row["Id"]);
storeClub(row, c);
oe->addClub(c);
-
- oe->sqlUpdateClubs = max(c.sqlUpdated, oe->sqlUpdateClubs);
- oe->sqlCounterClubs = max(c.counter, oe->sqlCounterClubs);
+ c.update(oe->sqlClubs);
}
}
}
@@ -1154,7 +1152,7 @@ OpFailStatus MeosSQL::SyncRead(oEvent *oe) {
pw.setProgress(30);
- oe->sqlCounterControls=0;
+ oe->sqlControls.reset();
try {
ResUse res = query.use("SELECT * FROM oControl WHERE Removed=0");
@@ -1166,9 +1164,7 @@ OpFailStatus MeosSQL::SyncRead(oEvent *oe) {
oControl c(oe, row["Id"]);
storeControl(row, c);
oe->addControl(c);
-
- oe->sqlUpdateControls = max(c.sqlUpdated, oe->sqlUpdateControls);
- oe->sqlCounterControls = max(c.counter, oe->sqlCounterControls);
+ c.update(oe->sqlControls);
}
}
}
@@ -1179,7 +1175,7 @@ OpFailStatus MeosSQL::SyncRead(oEvent *oe) {
return opStatusFail;
}
- oe->sqlCounterCourses = 0;
+ oe->sqlCourses.reset();
pw.setProgress(40);
try{
@@ -1193,9 +1189,7 @@ OpFailStatus MeosSQL::SyncRead(oEvent *oe) {
oCourse c(oe, row["Id"]);
storeCourse(row, c, tmp, false);
oe->addCourse(c);
-
- oe->sqlUpdateCourses = max(c.sqlUpdated, oe->sqlUpdateCourses);
- oe->sqlCounterCourses = max(c.counter, oe->sqlCounterCourses);
+ c.update(oe->sqlCourses);
}
}
}
@@ -1208,7 +1202,7 @@ OpFailStatus MeosSQL::SyncRead(oEvent *oe) {
pw.setProgress(50);
- oe->sqlCounterClasses = 0;
+ oe->sqlClasses.reset();
try{
ResUse res = query.use("SELECT * FROM oClass WHERE Removed=0");
@@ -1217,13 +1211,9 @@ OpFailStatus MeosSQL::SyncRead(oEvent *oe) {
while (row = res.fetch_row()) {
oClass c(oe, row["Id"]);
storeClass(row, c, false, false);
-
c.changed = false;
- c.reChanged = false;
oe->addClass(c);
-
- oe->sqlUpdateClasses = max(c.sqlUpdated, oe->sqlUpdateClasses);
- oe->sqlCounterClasses = max(c.counter, oe->sqlCounterClasses);
+ c.update(oe->sqlClasses);
}
}
}
@@ -1234,7 +1224,7 @@ OpFailStatus MeosSQL::SyncRead(oEvent *oe) {
return opStatusFail;
}
- oe->sqlCounterCards=0;
+ oe->sqlCards.reset();
try{
ResUse res = query.use("SELECT * FROM oCard WHERE Removed=0");
@@ -1250,9 +1240,7 @@ OpFailStatus MeosSQL::SyncRead(oEvent *oe) {
oe->addCard(c);
assert(!c.changed);
- oe->sqlCounterCards = max(c.counter, oe->sqlCounterCards);
- oe->sqlUpdateCards = max(c.sqlUpdated, oe->sqlUpdateCards);
-
+ c.update(oe->sqlCards);
if (++counter % 100 == 50)
pw.setProgress(pStart + (counter * pPart) / nCard);
}
@@ -1266,7 +1254,7 @@ OpFailStatus MeosSQL::SyncRead(oEvent *oe) {
return opStatusFail;
}
- oe->sqlCounterRunners = 0;
+ oe->sqlRunners.reset();
try{
ResUse res = query.use("SELECT * FROM oRunner WHERE Removed=0");
int counter = 0;
@@ -1280,9 +1268,7 @@ OpFailStatus MeosSQL::SyncRead(oEvent *oe) {
storeRunner(row, r, false, false, false, false);
assert(!r.changed);
oe->addRunner(r, false);
-
- oe->sqlUpdateRunners = max(r.sqlUpdated, oe->sqlUpdateRunners);
- oe->sqlCounterRunners = max(r.counter,oe->sqlCounterRunners);
+ r.update(oe->sqlRunners);
if (++counter % 100 == 50)
pw.setProgress(pStart + (counter * pPart) / nRunner);
@@ -1296,7 +1282,7 @@ OpFailStatus MeosSQL::SyncRead(oEvent *oe) {
return opStatusFail;
}
- oe->sqlCounterTeams=0;
+ oe->sqlTeams.reset();
try{
ResUse res = query.use("SELECT * FROM oTeam WHERE Removed=0");
@@ -1314,7 +1300,7 @@ OpFailStatus MeosSQL::SyncRead(oEvent *oe) {
pTeam at = oe->addTeam(t, false);
if (at) {
- at->apply(false, 0, true);
+ at->apply(oBase::ChangeType::Quiet, nullptr);
at->changed = false;
for (size_t k = 0; kRunners.size(); k++) {
if (at->Runners[k]) {
@@ -1323,9 +1309,8 @@ OpFailStatus MeosSQL::SyncRead(oEvent *oe) {
}
}
}
- oe->sqlUpdateTeams = max(t.sqlUpdated, oe->sqlUpdateTeams);
- oe->sqlCounterTeams = max(t.counter, oe->sqlCounterTeams);
-
+ t.update(oe->sqlTeams);
+
if (++counter % 100 == 50)
pw.setProgress(pStart + (counter * pPart) / nTeam);
}
@@ -1441,7 +1426,7 @@ void MeosSQL::storeClub(const Row &row, oClub &c)
c.counter = row["Counter"];
c.Removed = row["Removed"];
- c.oe->sqlChangedClubs = true;
+ c.oe->sqlClubs.changed = true;
c.changedObject();
synchronized(c);
@@ -1459,7 +1444,7 @@ void MeosSQL::storeControl(const Row &row, oControl &c)
c.counter = row["Counter"];
c.Removed = row["Removed"];
- c.oe->sqlChangedControls = true;
+ c.oe->sqlControls.changed = true;
if (c.changed || oldStat != c.Status) {
c.oe->dataRevision++;
c.changed = false;
@@ -1487,7 +1472,7 @@ void MeosSQL::storeCard(const Row &row, oCard &c)
}
c.changedObject();
synchronized(c);
- c.oe->sqlChangedCards = true;
+ c.oe->sqlCards.changed = true;
}
void MeosSQL::storePunch(const Row &row, oFreePunch &p, bool rehash)
@@ -1509,7 +1494,7 @@ void MeosSQL::storePunch(const Row &row, oFreePunch &p, bool rehash)
p.changedObject();
synchronized(p);
- p.oe->sqlChangedPunches = true;
+ p.oe->sqlPunches.changed = true;
}
OpFailStatus MeosSQL::storeClass(const Row &row, oClass &c,
@@ -1570,7 +1555,7 @@ OpFailStatus MeosSQL::storeClass(const Row &row, oClass &c,
c.changed = false;
c.changedObject();
- c.oe->sqlChangedClasses = true;
+ c.oe->sqlClasses.changed = true;
synchronized(c);
return success;
}
@@ -1611,7 +1596,7 @@ OpFailStatus MeosSQL::storeCourse(const Row &row, oCourse &c,
c.oe->dataRevision++;
c.changed = false;
c.changedObject();
- c.oe->sqlChangedCourses = true;
+ c.oe->sqlCourses.changed = true;
synchronized(c);
return success;
}
@@ -1633,7 +1618,7 @@ OpFailStatus MeosSQL::storeRunner(const Row &row, oRunner &r,
const wstring &oldBib = r.getBib();
r.sName = fromUTF((string)row["Name"]);
- oRunner::getRealName(r.sName, r.tRealName);
+ r.getRealName(r.sName, r.tRealName);
r.setCardNo(row["CardNo"], false, true);
r.StartNo = row["StartNo"];
r.tStartTime = r.startTime = row["StartTime"];
@@ -1675,6 +1660,8 @@ OpFailStatus MeosSQL::storeRunner(const Row &row, oRunner &r,
}
else r.Course=0;
+ pClass oldClass = r.Class;
+
if (int(row["Class"])!=0) {
r.Class=oe->getClass(int(row["Class"]));
@@ -1696,6 +1683,9 @@ OpFailStatus MeosSQL::storeRunner(const Row &row, oRunner &r,
}
else r.Class=0;
+ if (oldClass != r.Class)
+ oe->classIdToRunnerHash.reset();
+
if (int(row["Club"])!=0){
r.Club = oe->getClub(int(row["Club"]));
@@ -1776,7 +1766,7 @@ OpFailStatus MeosSQL::storeRunner(const Row &row, oRunner &r,
// Mark new class as changed
r.changedObject();
r.sqlChanged = true;
- r.oe->sqlChangedRunners = true;
+ r.oe->sqlRunners.changed = true;
synchronized(r);
return success;
@@ -1873,7 +1863,7 @@ OpFailStatus MeosSQL::storeTeam(const Row &row, oTeam &t,
if (or.sName.empty()) {
or.sName = L"@AutoCorrection";
- oRunner::getRealName(or.sName, or.tRealName);
+ or.getRealName(or.sName, or.tRealName);
}
if (!or.isRemoved()) {
@@ -1894,7 +1884,7 @@ OpFailStatus MeosSQL::storeTeam(const Row &row, oTeam &t,
t.Class->markSQLChanged(-1,-1);
t.sqlChanged = true;
- t.oe->sqlChangedTeams = true;
+ t.oe->sqlTeams.changed = true;
synchronized(t);
return success;
}
@@ -1951,7 +1941,6 @@ bool MeosSQL::Remove(oBase *ob)
ResNSel res = updateCounter(oTable.c_str(), ob->Id, &query);
ob->Removed = true;
ob->changed = false;
- ob->reChanged = false;
}
catch (const mysqlpp::Exception& er){
alert(string(er.what())+" [REMOVE " +oTable +"]");
@@ -2023,11 +2012,13 @@ OpFailStatus MeosSQL::syncRead(bool forceRead, oRunner *r, bool readClassClub, b
if (!r || !con.connected())
return opStatusFail;
- if (!forceRead && !r->existInDB())
- return syncUpdate(r, true);
+ if (!forceRead) {
+ if (!r->existInDB())
+ return syncUpdate(r, true);
- if (!r->changed && skipSynchronize(*r))
- return opStatusOK;
+ if (!r->changed && skipSynchronize(*r))
+ return opStatusOKSkipped;
+ }
try {
Query query = con.query();
@@ -2049,7 +2040,7 @@ OpFailStatus MeosSQL::syncRead(bool forceRead, oRunner *r, bool readClassClub, b
r->changed = false;
vector mp;
- r->evaluateCard(true, mp, 0, false);
+ r->evaluateCard(true, mp, 0, oBase::ChangeType::Quiet);
//Forget evaluated changes. Not our buisness to update.
r->changed = false;
@@ -2074,9 +2065,8 @@ OpFailStatus MeosSQL::syncRead(bool forceRead, oRunner *r, bool readClassClub, b
return syncUpdate(r, false);
vector mp;
- r->evaluateCard(true, mp, 0, false);
+ r->evaluateCard(true, mp, 0, oBase::ChangeType::Quiet);
r->changed = false;
- r->reChanged = false;
return opStatusOK;
}
@@ -2116,11 +2106,13 @@ OpFailStatus MeosSQL::syncRead(bool forceRead, oCard *c)
if (!c || !con.connected())
return opStatusFail;
- if (!forceRead && !c->existInDB())
- return syncUpdate(c, true);
+ if (!forceRead) {
+ if (!c->existInDB())
+ return syncUpdate(c, true);
- if (!c->changed && skipSynchronize(*c))
- return opStatusOK;
+ if (!c->changed && skipSynchronize(*c))
+ return opStatusOKSkipped;
+ }
try{
Query query = con.query();
@@ -2207,13 +2199,15 @@ OpFailStatus MeosSQL::syncRead(bool forceRead, oTeam *t, bool readRecursive)
if (!t || !con.connected())
return opStatusFail;
- if (!forceRead && !t->existInDB())
- return syncUpdate(t, true);
+ if (!forceRead) {
+ if (!t->existInDB())
+ return syncUpdate(t, true);
- if (!t->changed && skipSynchronize(*t))
- return opStatusOK;
+ if (!t->changed && skipSynchronize(*t))
+ return opStatusOK;
+ }
- try{
+ try {
Query query = con.query();
query << "SELECT * FROM oTeam WHERE Id=" << t->Id << andWhereOld(t);
Result res = query.store();
@@ -2230,7 +2224,6 @@ OpFailStatus MeosSQL::syncRead(bool forceRead, oTeam *t, bool readRecursive)
t->oe->dataRevision++;
t->Modified.update();
t->changed = false;
- t->reChanged = false;
return success;
}
else {
@@ -2252,7 +2245,7 @@ OpFailStatus MeosSQL::syncRead(bool forceRead, oTeam *t, bool readRecursive)
return success;
}
- return opStatusOK;
+ return opStatusOK;
}
catch (const mysqlpp::Exception& er){
alert(string(er.what())+" [SYNCREAD oTeam]");
@@ -2319,7 +2312,6 @@ OpFailStatus MeosSQL::syncRead(bool forceRead, oClass *c, bool readCourses)
c->oe->dataRevision++;
c->Modified.update();
c->changed = false;
- c->reChanged = false;
return opStatusOK;
}
else {
@@ -2488,17 +2480,21 @@ OpFailStatus MeosSQL::syncRead(bool forceRead, oClub *c)
if (!c || !con.connected())
return opStatusFail;
- if (!forceRead && !c->existInDB())
- return syncUpdate(c, true);
+ if (!forceRead) {
+ if (!c->existInDB())
+ return syncUpdate(c, true);
- try{
+ if (!c->changed && skipSynchronize(*c))
+ return opStatusOKSkipped;
+ }
+ try {
Query query = con.query();
query << "SELECT * FROM oClub WHERE Id=" << c->Id;
Result res = query.store();
Row row;
- if (!res.empty()){
- row=res.at(0);
+ if (!res.empty()) {
+ row = res.at(0);
if (!c->changed || isOld(row["Counter"], string(row["Modified"]), c)) {
OpFailStatus success = opStatusOK;
@@ -2508,21 +2504,21 @@ OpFailStatus MeosSQL::syncRead(bool forceRead, oClub *c)
storeClub(row, *c);
c->Modified.update();
- c->changed=false;
+ c->changed = false;
return success;
}
- else if (c->changed){
+ else if (c->changed) {
return syncUpdate(c, false);
}
}
- else{
+ else {
//Something is wrong!? Deleted?
return syncUpdate(c, true);
}
return opStatusOK;
}
- catch (const mysqlpp::Exception& er){
- alert(string(er.what())+" [SYNCREAD oClub]");
+ catch (const mysqlpp::Exception& er) {
+ alert(string(er.what()) + " [SYNCREAD oClub]");
return opStatusFail;
}
@@ -2557,8 +2553,13 @@ OpFailStatus MeosSQL::syncRead(bool forceRead, oControl *c)
if (!c || !con.connected())
return opStatusFail;
- if (!forceRead && !c->existInDB())
- return syncUpdate(c, true);
+ if (!forceRead) {
+ if (!c->existInDB())
+ return syncUpdate(c, true);
+
+ if (!c->changed && skipSynchronize(*c))
+ return opStatusOKSkipped;
+ }
try{
Query query = con.query();
@@ -2638,11 +2639,13 @@ OpFailStatus MeosSQL::syncReadCourse(bool forceRead, oCourse *c, set &readC
if (isTMP)
return opStatusFail;
- if (!forceRead && !c->existInDB())
- return syncUpdate(c, true);
+ if (!forceRead) {
+ if (!c->existInDB())
+ return syncUpdate(c, true);
- if (!c->changed && skipSynchronize(*c))
- return opStatusOK; // Skipped readout
+ if (!c->changed && skipSynchronize(*c))
+ return opStatusOKSkipped; // Skipped readout
+ }
try{
Query query = con.query();
@@ -2661,7 +2664,6 @@ OpFailStatus MeosSQL::syncReadCourse(bool forceRead, oCourse *c, set &readC
c->oe->dataRevision++;
c->Modified.update();
c->changed=false;
- c->reChanged=false;
return success;
}
else {
@@ -2721,11 +2723,13 @@ OpFailStatus MeosSQL::syncRead(bool forceRead, oFreePunch *c, bool rehash)
if (!c || !con.connected())
return opStatusFail;
- if (!forceRead && !c->existInDB())
- return syncUpdate(c, true);
+ if (!forceRead) {
+ if (!c->existInDB())
+ return syncUpdate(c, true);
- if (!c->changed && skipSynchronize(*c))
- return opStatusOK;
+ if (!c->changed && skipSynchronize(*c))
+ return opStatusOKSkipped;
+ }
try{
Query query = con.query();
@@ -3079,23 +3083,27 @@ bool MeosSQL::syncListRunner(oEvent *oe)
if (!con.connected())
return false;
-
+ int maxCounterRunner = -1;
try{
Query query = con.query();
/*query << "SELECT Id, Counter, Modified, Removed FROM oRunner";
query << " WHERE Counter > " << oe->sqlCounterRunners;
query << " OR Modified > '" << oe->sqlUpdateRunners << "'";*/
- Result res = query.store(selectUpdated("oRunner", oe->sqlUpdateRunners, oe->sqlCounterRunners));
+ Result res = query.store(selectUpdated("oRunner", oe->sqlRunners));
if (res) {
- for (int i=0; igetRunner(Id, 0);
if (r) {
@@ -3108,24 +3116,26 @@ bool MeosSQL::syncListRunner(oEvent *oe)
}
r->changedObject();
- oe->sqlChangedRunners = true;
+ oe->sqlRunners.changed = true;
}
}
else{
oRunner *r=oe->getRunner(Id, 0);
- if (r){
+ if (r) {
if (isOld(counter, modified, r))
- syncRead(false, r);
+ st = syncRead(false, r);
+ else
+ st = opStatusOK;
}
else {
oRunner or(oe, Id);
- syncRead(true, &or, false, false);
+ or.setImplicitlyCreated();
+ st = syncRead(true, &or, false, false);
r = oe->addRunner(or, false);
}
}
- oe->sqlCounterRunners = max(counter, oe->sqlCounterRunners);
- oe->sqlUpdateRunners = max(modified, oe->sqlUpdateRunners);
+ updateCounters(st, counter, modified, oe->sqlRunners, maxCounterRunner);
}
}
}
@@ -3133,59 +3143,60 @@ bool MeosSQL::syncListRunner(oEvent *oe)
alert(string(er.what())+" [SYNCLIST oRunner]");
return false;
}
+
+ if (maxCounterRunner > 0)
+ oe->sqlRunners.counter = maxCounterRunner - 1;
+
return true;
}
-bool MeosSQL::syncListClass(oEvent *oe)
-{
+bool MeosSQL::syncListClass(oEvent *oe) {
errorMessage.clear();
if (!con.connected())
return false;
- try{
+ int maxCounter = -1;
+ try {
Query query = con.query();
- /*
- query << "SELECT Id, Counter, Modified, Removed FROM oClass";
- query << " WHERE Counter > " << oe->sqlCounterClasses;
- query << " OR Modified > '" << oe->sqlUpdateClasses << "'";*/
-
- //Result res = query.store();
- Result res = query.store(selectUpdated("oClass", oe->sqlUpdateClasses, oe->sqlCounterClasses));
+ Result res = query.store(selectUpdated("oClass", oe->sqlClasses));
if (res) {
-
- for (int i=0; igetClass(Id);
+ st = OpFailStatus::opStatusOK;
+ oClass *c = oe->getClass(Id);
if (c) {
c->changedObject();
- c->Removed=true;
+ c->Removed = true;
}
}
else {
- oClass *c=oe->getClass(Id);
+ oClass *c = oe->getClass(Id);
if (!c) {
oClass oc(oe, Id);
- syncRead(true, &oc, false);
- c=oe->addClass(oc);
- if (c!=0) {
+ st = syncRead(true, &oc, false);
+ c = oe->addClass(oc);
+ if (c != 0) {
c->changed = false;
- //syncRead(true, c, false);
}
}
else if (isOld(counter, modified, c))
- syncRead(false, c, false);
+ st = syncRead(false, c, false);
+ else
+ st = opStatusOK;
}
- oe->sqlCounterClasses = max(counter, oe->sqlCounterClasses);
- oe->sqlUpdateClasses = max(modified, oe->sqlUpdateClasses);
+
+ updateCounters(st, counter, modified, oe->sqlClasses, maxCounter);
}
}
}
@@ -3193,119 +3204,127 @@ bool MeosSQL::syncListClass(oEvent *oe)
alert(string(er.what())+" [SYNCLIST oClass]");
return false;
}
+
+ if (maxCounter > 0)
+ oe->sqlClasses.counter = maxCounter - 1;
+
return true;
}
-
bool MeosSQL::syncListClub(oEvent *oe)
{
errorMessage.clear();
if (!con.connected())
return false;
+ int maxCounter = -1;
- try{
+ try {
Query query = con.query();
- /*query << "SELECT Id, Counter, Modified, Removed FROM oClub";
- query << " WHERE Counter > " << oe->sqlCounterClubs;
- query << " OR Modified > '" << oe->sqlUpdateClubs << "'";*/
- Result res = query.store(selectUpdated("oClub", oe->sqlUpdateClubs, oe->sqlCounterClubs));
+ Result res = query.store(selectUpdated("oClub", oe->sqlClubs));
if (res) {
- for(int i=0; igetClub(Id);
+ if (int(row["Removed"])) {
+ st = opStatusOK;
+ oClub *c = oe->getClub(Id);
if (c) {
- c->Removed=true;
+ c->Removed = true;
c->changedObject();
}
}
else {
- oClub *c=oe->getClub(Id);
+ oClub *c = oe->getClub(Id);
- if (c==0) {
+ if (c == 0) {
oClub oc(oe, Id);
- syncRead(true, &oc);
+ oc.setImplicitlyCreated();
+ st = syncRead(true, &oc);
oe->addClub(oc);
}
else if (isOld(counter, modified, c))
- syncRead(false, c);
+ st = syncRead(false, c);
+ else
+ st = opStatusOK;
}
- oe->sqlCounterClubs = max(counter, oe->sqlCounterClubs);
- oe->sqlUpdateClubs = max(modified, oe->sqlUpdateClubs);
+ updateCounters(st, counter, modified, oe->sqlClubs, maxCounter);
}
}
}
- catch (const mysqlpp::Exception& er){
- alert(string(er.what())+" [SYNCLIST oClub]");
+ catch (const mysqlpp::Exception& er) {
+ alert(string(er.what()) + " [SYNCLIST oClub]");
return false;
}
+ if (maxCounter > 0)
+ oe->sqlClubs.counter = maxCounter - 1;
+
return true;
}
-
-bool MeosSQL::syncListCourse(oEvent *oe)
-{
+bool MeosSQL::syncListCourse(oEvent *oe) {
errorMessage.clear();
if (!con.connected())
return false;
-
- try{
+ int maxCounter = -1;
+ try {
Query query = con.query();
- /*
- query << "SELECT Id, Counter, Modified, Removed FROM oCourse";
- query << " WHERE Counter > " << oe->sqlCounterCourses;
- query << " OR Modified > '" << oe->sqlUpdateCourses << "'";
- */
- Result res = query.store(selectUpdated("oCourse", oe->sqlUpdateCourses, oe->sqlCounterCourses));
-
+ Result res = query.store(selectUpdated("oCourse", oe->sqlCourses));
if (res) {
set tmp;
- for(int i=0; i