summaryrefslogtreecommitdiff
path: root/src/sysync/syncagent.cpp
diff options
context:
space:
mode:
authorLukas Zeller <luz@synthesis.ch>2010-02-18 17:51:16 +0100
committerLukas Zeller <luz@synthesis.ch>2010-02-19 00:04:42 +0100
commit6626a57e9e249b8977688e20fab05aa67f18cf78 (patch)
tree2d76756d5eba8addb20253d8a398eb41edd16a2b /src/sysync/syncagent.cpp
parent9d3b72bb923082ac639c409c951f317ae8b51357 (diff)
Engine 3.4.0.5: implemented client-side superdatastores according to suggestion/draft implementation of Patrick
- Re-implemented along Patrick's changes in his working implementation, but making it generic and no longer depending on binfile classes, such that it should work with console clients as well. - changed the superdatastore trigger syntax from <super:remotepath> to the already discussed <super>remotepath - tested ok against synthesis IOT calendar (with iPhone client).
Diffstat (limited to 'src/sysync/syncagent.cpp')
-rwxr-xr-xsrc/sysync/syncagent.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/sysync/syncagent.cpp b/src/sysync/syncagent.cpp
index c7eee56..12bb2e1 100755
--- a/src/sysync/syncagent.cpp
+++ b/src/sysync/syncagent.cpp
@@ -1088,9 +1088,9 @@ localstatus TSyncAgent::NextMessage(bool &aDone)
bool anyslowsyncs=false;
TLocalEngineDS *localDS;
for (pos=fLocalDataStores.begin(); pos!=fLocalDataStores.end(); ++pos) {
- // prepare alert
+ // prepare alert (Note: datastore may be run by a superdatastore)
localDS = *pos;
- status=localDS->engPrepareClientSyncAlert(NULL); // not as superdatastore
+ status=localDS->engPrepareClientSyncAlert();
if (status!=LOCERR_OK) {
// local database error
return localError(status); // not found
@@ -1138,7 +1138,7 @@ localstatus TSyncAgent::NextMessage(bool &aDone)
localDS = *pos;
if (!localDS->isSubDatastore()) {
TAlertCommand *alertcmdP;
- status=localDS->engGenerateClientSyncAlert(alertcmdP);
+ status = localDS->engGenerateClientSyncAlert(alertcmdP);
if (status!=0) {
// local database error
return status; // not found