From 2010e69ba17878fa26b8e7f877b3118c8beddfaa Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Mon, 22 Sep 2008 20:30:38 +0000 Subject: [PATCH] Monotone-Parent: 71a37a8727106fb3b5a2e048b75a48d35e41e9c7 Monotone-Revision: 969dc7fa865e2a68ad6c7444c791560305b19ca9 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2008-09-22T20:30:38 Monotone-Branch: ca.inverse.sogo --- SOPE/GDLContentStore/ChangeLog | 6 ++++++ SOPE/GDLContentStore/GCSFolder.h | 4 ++++ SOPE/GDLContentStore/GCSFolder.m | 18 +++++++++--------- 3 files changed, 19 insertions(+), 9 deletions(-) diff --git a/SOPE/GDLContentStore/ChangeLog b/SOPE/GDLContentStore/ChangeLog index d7ca02fbb..19b1315ae 100644 --- a/SOPE/GDLContentStore/ChangeLog +++ b/SOPE/GDLContentStore/ChangeLog @@ -1,3 +1,9 @@ +2008-09-22 Wolfgang Sourdeau + + * GCSFolder.m ([GCSFolder + -fetchFields:fieldsfetchSpecification:specignoreDeleted:ignoreDeleted]): + made method public. + 2008-08-09 Wolfgang Sourdeau * GCSFolder.m ([GCSFolder diff --git a/SOPE/GDLContentStore/GCSFolder.h b/SOPE/GDLContentStore/GCSFolder.h index 2fedb012a..a586e9cad 100644 --- a/SOPE/GDLContentStore/GCSFolder.h +++ b/SOPE/GDLContentStore/GCSFolder.h @@ -130,6 +130,10 @@ - (NSArray *) fetchFields: (NSArray *) _flds fetchSpecification: (EOFetchSpecification *) _fs; +- (NSArray *) fetchFields: (NSArray *) fields + fetchSpecification: (EOFetchSpecification *) spec + ignoreDeleted: (BOOL) ignoreDeleted; + - (NSArray *) fetchFields: (NSArray *) _flds matchingQualifier: (EOQualifier *) _q; - (NSArray *) fetchAclMatchingQualifier: (EOQualifier *) _q; diff --git a/SOPE/GDLContentStore/GCSFolder.m b/SOPE/GDLContentStore/GCSFolder.m index 0c95ebdec..f2ca45de9 100644 --- a/SOPE/GDLContentStore/GCSFolder.m +++ b/SOPE/GDLContentStore/GCSFolder.m @@ -501,9 +501,9 @@ static NSArray *contentFieldNames = nil; return sql; } -- (NSArray *) _fetchFields: (NSArray *) fields - fetchSpecification: (EOFetchSpecification *) spec - ignoreDeleted: (BOOL) ignoreDeleted +- (NSArray *) fetchFields: (NSArray *) fields + fetchSpecification: (EOFetchSpecification *) spec + ignoreDeleted: (BOOL) ignoreDeleted { EOAdaptorChannel *channel; NSException *error; @@ -577,7 +577,7 @@ static NSArray *contentFieldNames = nil; columns = [NSArray arrayWithObjects: @"c_content", @"c_version", @"c_creationdate", @"c_lastmodified", nil]; rows - = [self _fetchFields: columns + = [self fetchFields: columns fetchSpecification: [self _simpleFetchSpecificationWith: @"c_name" andValue: name] ignoreDeleted: YES]; @@ -834,10 +834,10 @@ static NSArray *contentFieldNames = nil; if (doLogStore) [self logWithFormat:@"should store content: '%@'\n%@", _name, _content]; - rows = [self _fetchFields: [NSArray arrayWithObjects: - @"c_version", - @"c_deleted", - nil] + rows = [self fetchFields: [NSArray arrayWithObjects: + @"c_version", + @"c_deleted", + nil] fetchSpecification: [self _simpleFetchSpecificationWith: @"c_name" andValue: _name] @@ -1107,7 +1107,7 @@ static NSArray *contentFieldNames = nil; - (NSArray *) fetchFields: (NSArray *) fields fetchSpecification: (EOFetchSpecification *) spec { - return [self _fetchFields: fields + return [self fetchFields: fields fetchSpecification: spec ignoreDeleted: YES]; }