xlawrence 2005/02/01 11:14:11 CET
Modified files:
syncServer/src/java/org/jahia/suite/calendar/sync4jModule
CalendarSyncSourceOutlook.java
Log:
The Outlook SyncSource now ignores the CONTACT property. This means, no more
Exceptions are thrown when public events are synchronized
Revision Changes Path
1.4 +6 -6
uwcal_JSR168/syncServer/src/java/org/jahia/suite/calendar/sync4jModule/CalendarSyncSourceOutlook.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/uwcal_JSR168/syncServer/src/java/org/jahia/suite/calendar/sync4jModule/CalendarSyncSourceOutlook.java.diff?r1=1.3&r2=1.4&f=h
Index: CalendarSyncSourceOutlook.java
===================================================================
RCS file:
/home/cvs/repository/uwcal_JSR168/syncServer/src/java/org/jahia/suite/calendar/sync4jModule/CalendarSyncSourceOutlook.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- CalendarSyncSourceOutlook.java 28 Jan 2005 17:44:19 -0000 1.3
+++ CalendarSyncSourceOutlook.java 1 Feb 2005 10:14:11 -0000 1.4
@@ -205,12 +205,12 @@
"VERSION:2.0\r\n" +
"METHOD:PUBLISH\r\n" +
event +
- "END:VCALENDAR";
-
- log.debug("content: "+content);
+ "END:VCALENDAR";
content = compatibleString(content);
+ log.debug("Content: "+content);
+
ByteArrayInputStream buffer = new
ByteArrayInputStream(content.getBytes());
ICalendarParser parser = new ICalendarParser(buffer);
@@ -336,7 +336,7 @@
case 0:
// Remove the CONTACT property
if (!line.startsWith("CONTACT")) {
- result += line;
+ result += line + "\r\n";
break;
}
log.debug("Removed a line in state 0: "+line);
@@ -346,8 +346,8 @@
// State removing any extra lines if the desired
removed
// property goes through more than 1 line
case 1:
- if (line.endsWith("\r\n")) {
- result += line;
+ if (!line.startsWith(" ")) {
+ result += line + "\r\n";
state = 0;
break;
}
