maryjane
/
syncevolution
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

vcard: fix caching of PBAP contacts (FDO #84710) 

After changing PBAP to send raw items, caching them led to unnecessary
disk writes and bogus "contacts changed" reports. That's because
the merge script relied on the exact order of properties, which was
only the same when doing the redundant decode/encode on the PBAP side.

Instead of reverting back to sending re-encoded items, better enhance
the contact merge script such that it detects contacts as unchanged
when just the order of entries in the property arrays is different.
This relies on an enhanced libsynthesis with the new RELAXEDCOMPARE()
and modified MERGEFIELDS().
This commit is contained in:
Patrick Ohly 2014-10-09 21:27:30 +02:00
parent 936ccc5df2
commit 2e2c9dca77
1 changed files with 39 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/syncevo/configs/scripting/05vcard-merge.xml
View File

@ -14,6 +14,9 @@
winningchanged = 0;
loosingchanged = 0;
STRING ignorefields;
ignorefields = "";
if (SESSIONVAR("keepPhotoData") &&
WINNING.PHOTO == EMPTY &&
LOOSING.PHOTO != EMPTY) {
@ -55,6 +58,41 @@
LOOSING.PHOTO = EMPTY;
}
// In cache mode, we don't care about the order of entries, so
// we do our own relaxed comparison and tell the engine to ignore
// fields if the only change is in the ordering.
if (CACHEDATA()) {
ignorefields = ignorefields + RELAXEDCOMPARE("TEL", "", "TEL_FLAGS", "TEL_SLOT", "LABEL");
ignorefields = ignorefields + RELAXEDCOMPARE("XDATE", "", "LABEL");
ignorefields = ignorefields + RELAXEDCOMPARE("EMAIL", "", "EMAIL_FLAGS", "EMAIL_SLOT", "LABEL");
ignorefields = ignorefields + RELAXEDCOMPARE("WEB", "", "WEB_FLAGS", "LABEL");
ignorefields = ignorefields + RELAXEDCOMPARE("CALURI");
ignorefields = ignorefields + RELAXEDCOMPARE("FBURL");
ignorefields = ignorefields + RELAXEDCOMPARE("BLOGURL");
ignorefields = ignorefields + RELAXEDCOMPARE("VIDEOURL");
ignorefields = ignorefields + RELAXEDCOMPARE("RELATEDNAMES", "", "LABEL");
ignorefields = ignorefields + RELAXEDCOMPARE("IMPP", "", "IMPP_SERVICE", "IMPP_SLOT", "LABEL");
ignorefields = ignorefields + RELAXEDCOMPARE("AIM_HANDLE", "", "AIM_SLOT");
ignorefields = ignorefields + RELAXEDCOMPARE("GADUGADU_HANDLE", "", "GADUGADU_SLOT");
ignorefields = ignorefields + RELAXEDCOMPARE("GROUPWISE_HANDLE", "", "GROUPWISE_SLOT");
ignorefields = ignorefields + RELAXEDCOMPARE("ICQ_HANDLE", "", "ICQ_SLOT");
ignorefields = ignorefields + RELAXEDCOMPARE("JABBER_HANDLE", "", "JABBER_SLOT");
ignorefields = ignorefields + RELAXEDCOMPARE("MSN_HANDLE", "", "MSN_SLOT");
ignorefields = ignorefields + RELAXEDCOMPARE("YAHOO_HANDLE", "", "YAHOO_SLOT");
ignorefields = ignorefields + RELAXEDCOMPARE("SKYPE_HANDLE", "", "SKYPE_SLOT");
ignorefields = ignorefields + RELAXEDCOMPARE("SIP_HANDLE", "", "SIP_SLOT");
ignorefields = ignorefields + RELAXEDCOMPARE("EMAIL", "", "EMAIL_FLAGS", "EMAIL_SLOT", "LABEL");
ignorefields = ignorefields + RELAXEDCOMPARE("ADR", "ADR_STREET", "ADR_ADDTL", "ADR_STREET_FLAGS", "ADR_POBOX", "ADR_CITY", "ADR_REG", "ADR_ZIP", "ADR_COUNTRY", "", "LABEL");
// Always ignore the label. Otherwise reordering will cause unnecessary
// writes. We check for reordering more selectively above, but because
// the LABEL field is shared, we cannot do the same for it.
// The downside is that changes in just the label of an entry will not
// cause an update of the cache. Some other value must be modified, too,
// to trigger a write.
ignorefields = ignorefields + " LABEL";
}
// When running in caching mode, we end up executing the merge script,
// but in that case we want to remove data from the loosing item and
// thus need to skip the array merging.
@ -379,5 +417,5 @@
if (loosingchanged) { SETLOOSINGCHANGED(1); }
// Continue merge.
MERGEFIELDS(mode);
MERGEFIELDS(mode, ignorefields);
]]></macro>