From 76dc2a9a33bf76343140b06433f0c1a489b30ffd Mon Sep 17 00:00:00 2001 From: C Robert Date: Thu, 24 Sep 2009 14:29:24 +0000 Subject: [PATCH] Fixed the exception in calendar export Monotone-Parent: 205804a9bd292606338821a772967d790803a9d7 Monotone-Revision: 186728a29cda680b5f407135f9661441a93e1027 Monotone-Author: crobert@inverse.ca Monotone-Date: 2009-09-24T14:29:24 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 5 +++++ SoObjects/Appointments/SOGoAppointmentFolder.m | 10 +++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index aa8ddf978..cda471ca2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2009-09-24 Cyril Robert + + * SoObjects/Appointments/SOGoAppointmentFolder.m (bareFetchFields:): Handled + the Exception when all conditions are nil. + 2009-09-23 Cyril Robert * SoObjects/Appointments/SOGoAppointmentFolder.m (importComponent:): Fixed diff --git a/SoObjects/Appointments/SOGoAppointmentFolder.m b/SoObjects/Appointments/SOGoAppointmentFolder.m index 07ead8ff8..617e52f33 100644 --- a/SoObjects/Appointments/SOGoAppointmentFolder.m +++ b/SoObjects/Appointments/SOGoAppointmentFolder.m @@ -628,9 +628,13 @@ static int davCalendarStartTimeLimit, davTimeLimitSeconds, /* prepare mandatory fields */ - sql = [[NSString stringWithFormat: @"%@%@%@%@", - dateSqlString, titleSqlString, componentSqlString, - filterSqlString] substringFromIndex: 4]; + sql = [NSString stringWithFormat: @"%@%@%@%@", + dateSqlString, titleSqlString, componentSqlString, + filterSqlString]; + if ([sql length] > 0) + sql = [sql substringFromIndex: 4]; + else + sql = nil; /* fetch non-recurrent apts first */ qualifier = [EOQualifier qualifierWithQualifierFormat: sql];