|
|
Same problem with Outlook under Windows XP and Windows 7 using the latest Funambol sync client 8.5.4.
No fix for it? |
|
|
|
This only occurs if modifying existing events.
Maybe an error in the function "updatevEventSyncItem" ?
Seems as so the "tag" is not removed before updating the event.
Or could it be an error of the v2->v1 conversion routines which Havard added? |
|
|
|
Reminder sent to: havardw
Havard, could you look at this? |
|
|
|
Sorry for the late reply, I've been away for a few days.
The analysis is correct, I've introduced an error in updates for events (and also tasks) when I changed the conversion routines. The title used was from before the tag was removed, and thus need to be updated.
I'll attach a patch that might fix this. Pleas note that this patch is NOT TESTED at all. I'm a bit short on time for the next week, I'll try to get some testing done then if no one beats me to it. |
|
|
|
duplicate_tag_fix.patch (2,825 bytes)
Index: src/java/ca/inverse/sogo/engine/source/SOGoEventUtilities.java
===================================================================
--- src/java/ca/inverse/sogo/engine/source/SOGoEventUtilities.java (revision 31)
+++ src/java/ca/inverse/sogo/engine/source/SOGoEventUtilities.java (revision )
@@ -302,6 +302,8 @@
userTZ = SOGoUtilities.getUserTimeZone(source, context, log);
data = new CalendarData(item, userTZ, source.getDeviceCharset());
c_content = data.getContent();
+ event = data.getCalendar().getEvent();
+ c_title = event.getSummary().getPropertyValueAsString();
// If the event is tagged, we must untag it and check ACLs.
if (tag != null) {
@@ -320,9 +322,9 @@
throw new SyncSourceException("No access rights on " + collection + " - Modifier is needed");
c_content = SOGoUtilities.removeTagFromContent(c_content, tag, source, context, log);
+ c_title = c_title.substring(tag.length() + 1);
}
- event = data.getCalendar().getEvent();
c_classification = SOGoUtilities.getClassification(event);
c_name = SOGoKey.encodeString(item.getKey().getKeyAsString());
c_cycleinfo = null;
@@ -330,8 +332,7 @@
s_date = getStartDate(event, source, context, log);
e_date = getEndDate(event, source, context, log);
- c_title = event.getSummary().getPropertyValueAsString();
-
+
if (event.getLocation() != null) {
c_location = event.getLocation().getPropertyValueAsString();
} else {
Index: src/java/ca/inverse/sogo/engine/source/SOGoTaskUtilities.java
===================================================================
--- src/java/ca/inverse/sogo/engine/source/SOGoTaskUtilities.java (revision 31)
+++ src/java/ca/inverse/sogo/engine/source/SOGoTaskUtilities.java (revision )
@@ -286,6 +286,8 @@
userTZ = SOGoUtilities.getUserTimeZone(source, context, log);
data = new CalendarData(item, userTZ, source.getDeviceCharset());
c_content = data.getContent();
+ task = data.getCalendar().getTask();
+ c_title = task.getSummary().getPropertyValueAsString();
// If the event is tagged, we must untag it and check ACLs.
if (tag != null) {
@@ -304,11 +306,10 @@
throw new SyncSourceException("No access rights on " + collection + " - Modifier is needed");
c_content = SOGoUtilities.removeTagFromContent(c_content, tag, source, context, log);
+ c_title = c_title.substring(tag.length() + 1);
}
- task = data.getCalendar().getTask();
c_name = SOGoKey.encodeString(item.getKey().getKeyAsString());
- c_title = task.getSummary().getPropertyValueAsString();
c_classification = SOGoUtilities.getClassification(task);
if (task.getComplete().getPropertyValue() == null) {
|
|
|
|
Hi hardardw,
thanks for your efforts.
I'll test your patch the next days and report the results of my testing. |
|
|
|
It doesn't work :(
This should work for c_title:
tag = ("[" + tag + "]").toLowerCase();
if (c_title.toLowerCase().startsWith(tag)) {
c_title = c_title.substring(tag.length()+1);
}
But this is not the main problem. "c_title" is only used in the Quick-DB-Table. Where is this table for?
The Quick-Table seems to be only for the preview in SOGo?
In Thunderbird and if you go to the Edit-View in SOGo Webinterface there is still the hole tag!!
It seems as so the tag isn't removed in
c_content = SOGoUtilities.removeTagFromContent(c_content, tag, source, context, log);
The tag is still in "c_content". Is the function "removeTagFromContent" maybe faulty?! |
|
|
|
After several further tests I can say that "removeTagFromContent" seems to work.
The tags are stripped in the logs.
Instead the tags appear again around line 350 in the if-statement
if (doMerge) {....
in function "updatevEventSyncItem" of SOGoEventUtilities.java |
|
|
|
wcronen, the reappearance of the tag is probably because the merge code uses the event object instead of c_content, and this object was parsed from content with the tag included.
I've done a quick attempt at a patch that also modifies the title for the event object. Also, for the code example in comment 1034, I suppose you mean that I'd forgotten to account for the braces when calculating tag lenght? I just added 2 extra to the length, as I already know that the tag is there when I'm removing it.
ludovic: What I'd like to do here is to move tag removal into the CalendarData I created, to get rid of the extra parsing steps and to update all the different data types at once. |
|
|
|
Have you uploaded your 2nd patch? I can't see it here.
I'd really like to test your new patch.
Thx in advance. |
|
|
|
duplicate_tag_fix_v2.patch (2,951 bytes)
Index: src/java/ca/inverse/sogo/engine/source/SOGoEventUtilities.java
===================================================================
--- src/java/ca/inverse/sogo/engine/source/SOGoEventUtilities.java (revision 31)
+++ src/java/ca/inverse/sogo/engine/source/SOGoEventUtilities.java (revision )
@@ -302,6 +302,8 @@
userTZ = SOGoUtilities.getUserTimeZone(source, context, log);
data = new CalendarData(item, userTZ, source.getDeviceCharset());
c_content = data.getContent();
+ event = data.getCalendar().getEvent();
+ c_title = event.getSummary().getPropertyValueAsString();
// If the event is tagged, we must untag it and check ACLs.
if (tag != null) {
@@ -320,9 +322,10 @@
throw new SyncSourceException("No access rights on " + collection + " - Modifier is needed");
c_content = SOGoUtilities.removeTagFromContent(c_content, tag, source, context, log);
+ c_title = c_title.substring(tag.length() + 3);
+ event.getSummary().setPropertyValue(c_title);
}
- event = data.getCalendar().getEvent();
c_classification = SOGoUtilities.getClassification(event);
c_name = SOGoKey.encodeString(item.getKey().getKeyAsString());
c_cycleinfo = null;
@@ -330,8 +333,7 @@
s_date = getStartDate(event, source, context, log);
e_date = getEndDate(event, source, context, log);
- c_title = event.getSummary().getPropertyValueAsString();
-
+
if (event.getLocation() != null) {
c_location = event.getLocation().getPropertyValueAsString();
} else {
Index: src/java/ca/inverse/sogo/engine/source/SOGoTaskUtilities.java
===================================================================
--- src/java/ca/inverse/sogo/engine/source/SOGoTaskUtilities.java (revision 31)
+++ src/java/ca/inverse/sogo/engine/source/SOGoTaskUtilities.java (revision )
@@ -286,6 +286,8 @@
userTZ = SOGoUtilities.getUserTimeZone(source, context, log);
data = new CalendarData(item, userTZ, source.getDeviceCharset());
c_content = data.getContent();
+ task = data.getCalendar().getTask();
+ c_title = task.getSummary().getPropertyValueAsString();
// If the event is tagged, we must untag it and check ACLs.
if (tag != null) {
@@ -304,11 +306,11 @@
throw new SyncSourceException("No access rights on " + collection + " - Modifier is needed");
c_content = SOGoUtilities.removeTagFromContent(c_content, tag, source, context, log);
+ c_title = c_title.substring(tag.length() + 3);
+ task.getSummary().setPropertyValue(c_title);
}
- task = data.getCalendar().getTask();
c_name = SOGoKey.encodeString(item.getKey().getKeyAsString());
- c_title = task.getSummary().getPropertyValueAsString();
c_classification = SOGoUtilities.getClassification(task);
if (task.getComplete().getPropertyValue() == null) {
|
|
|
|
I've uploaded the patch now, I forgot that I can't upload and comment in one operation. |
|
|
|
Great Job, Havard!!!
The 2nd patch works great. Now tags are removed from added/modified events before writing to the database.
@ludovic: Could you please include this 2nd patch in the svn version? |
|
|
|
The fix has been pushed. |
|
