Monotone-Parent: ebecad29c1790b7953cfe00229ae3666abb9f896

Monotone-Revision: 1f66b697aa5dc8a2fb659718acc74a79c3a3576b

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2009-06-08T17:16:09
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2009-06-08 17:16:09 +00:00
parent 9c394ac8e6
commit f5b4ab3325
3 changed files with 41 additions and 34 deletions
+6
View File
@@ -1,3 +1,9 @@
2009-06-08 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* SoObjects/SOGo/SOGoGCSFolder.m (-davCollectionTag): moved method
from SOGoAppointmentFolder since we will need it for contacts
folders as well.
2009-06-08 Cyril Robert <crobert@inverse.ca>
* SoObjects/Appointments/SOGoAppointmentFolder.m: Added c_cycleenddate in
@@ -2231,37 +2231,6 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
return colType;
}
- (NSString *) davCollectionTag
{
NSArray *records;
GCSFolder *folder;
static EOFetchSpecification *cTagSpec = nil;
EOSortOrdering *ordering;
NSNumber *lastModified;
NSString *cTag;
folder = [self ocsFolder];
ordering = [EOSortOrdering sortOrderingWithKey: @"c_lastmodified"
selector: EOCompareDescending];
cTagSpec = [EOFetchSpecification
fetchSpecificationWithEntityName: [folder folderName]
qualifier: nil
sortOrderings: [NSArray arrayWithObject: ordering]];
records = [folder fetchFields: [NSArray arrayWithObject: @"c_lastmodified"]
fetchSpecification: cTagSpec
ignoreDeleted: NO];
if ([records count])
{
lastModified = [[records objectAtIndex: 0] objectForKey: @"c_lastmodified"];
cTag = [lastModified stringValue];
}
else
cTag = @"-1";
return cTag;
}
- (NSString *) davDescription
{
return @"";
+35 -3
View File
@@ -611,6 +611,38 @@ static NSArray *childRecordFields = nil;
}
}
- (NSString *) davCollectionTag
{
NSArray *records;
GCSFolder *folder;
static EOFetchSpecification *cTagSpec = nil;
EOSortOrdering *ordering;
NSNumber *lastModified;
NSString *cTag;
folder = [self ocsFolder];
ordering = [EOSortOrdering sortOrderingWithKey: @"c_lastmodified"
selector: EOCompareDescending];
cTagSpec = [EOFetchSpecification
fetchSpecificationWithEntityName: [folder folderName]
qualifier: nil
sortOrderings: [NSArray arrayWithObject: ordering]];
records = [folder fetchFields: [NSArray arrayWithObject: @"c_lastmodified"]
fetchSpecification: cTagSpec
ignoreDeleted: NO];
if ([records count])
{
lastModified = [[records objectAtIndex: 0]
objectForKey: @"c_lastmodified"];
cTag = [lastModified stringValue];
}
else
cTag = @"-1";
return cTag;
}
#warning this code should be cleaned up
- (void) _subscribeUser: (SOGoUser *) subscribingUser
reallyDo: (BOOL) reallyDo
@@ -744,15 +776,15 @@ static NSArray *childRecordFields = nil;
- (id <WOActionResults>) davSubscribe: (WOContext *) queryContext
{
return [self subscribe: YES
inTheNamesOf: [self _parseDAVDelegatedUser: queryContext]
fromMailInvitation: NO
inTheNamesOf: [self _parseDAVDelegatedUser: queryContext]
fromMailInvitation: NO
inContext: queryContext];
}
- (id <WOActionResults>) davUnsubscribe: (WOContext *) queryContext
{
return [self subscribe: NO
inTheNamesOf: [self _parseDAVDelegatedUser: queryContext]
inTheNamesOf: [self _parseDAVDelegatedUser: queryContext]
fromMailInvitation: NO
inContext: queryContext];
}