Monotone-Parent: 9d04bb12c8d80ff6b3b9bc4e3a279367bcc4e15d

Monotone-Revision: 32603de9ab1d203022bc9057ffa2e1fd8da6a44d

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-07-10T14:15:07
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2007-07-10 14:15:07 +00:00
parent d79474157a
commit 52334b00ef
2 changed files with 23 additions and 9 deletions
+6
View File
@@ -1,3 +1,9 @@
2007-07-10 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* OGoContentStore/OCSiCalFieldExtractor.m ([OCSiCalFieldExtractor
-extractQuickFieldsFromTodo:_task]): set "isallday" and "isopaque"
to false to avoid a null violation.
2007-07-04 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* SoObjects/Mailer/SOGoMailObject.m ([SOGoMailObject
+17 -9
View File
@@ -19,11 +19,18 @@
02111-1307, USA.
*/
#include "OCSiCalFieldExtractor.h"
#include "common.h"
#include <NGCards/NGCards.h>
#include "iCalEntityObject+OCS.h"
#include "iCalRepeatableEntityObject+OCS.h"
#import <Foundation/NSCalendarDate.h>
#import <Foundation/NSNull.h>
#import <Foundation/NSString.h>
#import <Foundation/NSValue.h>
#import <NGExtensions/NSNull+misc.h>
#import <NGExtensions/NSObject+Logs.h>
#import "iCalEntityObject+OCS.h"
#import "iCalRepeatableEntityObject+OCS.h"
#import "OCSiCalFieldExtractor.h"
@implementation OCSiCalFieldExtractor
@@ -250,6 +257,11 @@ static NSNumber *distantFutureNumber = nil;
[row setObject:[NSNumber numberWithInt:[_task priorityNumber]]
forKey: @"priority"];
[row setObject: [NSNumber numberWithBool: NO]
forKey: @"isallday"];
[row setObject: [NSNumber numberWithBool: NO]
forKey: @"isopaque"];
if ([title isNotNull]) [row setObject: title forKey: @"title"];
if ([location isNotNull]) [row setObject: location forKey: @"location"];
if ([sequence isNotNull]) [row setObject: sequence forKey: @"sequence"];
@@ -342,14 +354,12 @@ static NSNumber *distantFutureNumber = nil;
}
- (NSMutableDictionary *)extractQuickFieldsFromContent:(NSString *)_content {
NSAutoreleasePool *pool;
NSDictionary *fields;
id cal;
if ([_content length] == 0)
return nil;
pool = [[NSAutoreleasePool alloc] init];
cal = [iCalCalendar parseSingleFromSource: _content];
fields = nil;
@@ -370,8 +380,6 @@ static NSNumber *distantFutureNumber = nil;
else
[self logWithFormat: @"ERROR: parsing source didn't return anything"];
[pool release];
return [fields autorelease];
}