From bd4be10c8169ed10c152d1c37ae72fce660b9872 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Thu, 19 Oct 2006 14:33:46 +0000 Subject: [PATCH] Monotone-Parent: aff338d65b5e579727f2177355e636b8689e074d Monotone-Revision: 75931ec80dae04f15fd7f790b6de21b0b724e457 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2006-10-19T14:33:46 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 7 +++++++ OGoContentStore/OCSiCalFieldExtractor.m | 15 +++++++++++---- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index d4218014e..f4f2cba44 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2006-10-19 Wolfgang Sourdeau + + * OGoContentStore/OCSiCalFieldExtractor.m ([OCSiCalFieldExtractor + -extractQuickFieldsFromTodo:_task]): set the start and enddate of + quickentries to null whenever each or all of them are null, by + providing an impossible timestamp from with NSNotFound as value. + 2006-10-18 Wolfgang Sourdeau * UI/WebServerResources/UIxMailEditor.js: update the algorithm diff --git a/OGoContentStore/OCSiCalFieldExtractor.m b/OGoContentStore/OCSiCalFieldExtractor.m index 06e26c75d..1231aa504 100644 --- a/OGoContentStore/OCSiCalFieldExtractor.m +++ b/OGoContentStore/OCSiCalFieldExtractor.m @@ -193,7 +193,7 @@ static NSNumber *distantFutureNumber = nil; NSCalendarDate *startDate, *dueDate; NSArray *attendees; NSString *uid, *title, *location, *status, *accessClass; - NSNumber *sequence; + NSNumber *sequence, *date; id organizer; id participants, partmails; NSMutableString *partstates; @@ -239,10 +239,17 @@ static NSNumber *distantFutureNumber = nil; if ([location isNotNull]) [row setObject: location forKey:@"location"]; if ([sequence isNotNull]) [row setObject: sequence forKey:@"sequence"]; - if ([startDate isNotNull]) - [row setObject: [self numberForDate:startDate] forKey:@"startdate"]; + if ([startDate isNotNull]) + date = [self numberForDate: startDate]; + else + date = [NSNumber numberWithInt: NSNotFound]; + [row setObject: date forKey: @"startdate"]; if ([dueDate isNotNull]) - [row setObject: [self numberForDate:dueDate] forKey:@"enddate"]; + date = [self numberForDate: dueDate]; + else + date = [NSNumber numberWithInt: NSNotFound]; + [row setObject: date forKey: @"enddate"]; + if ([participants length] > 0) [row setObject:participants forKey:@"participants"]; if ([partmails length] > 0)