From 1c3070203710ad853efa680c41d9e7b0be4d039a Mon Sep 17 00:00:00 2001
From: cramakri <cramakri>
Date: Thu, 1 Nov 2012 12:17:33 +0000
Subject: [PATCH] Renamed entityFetchRequest to fetchRequestForEntities and
added methods to return other fetch requests.
SVN: 27453
---
.../BisKit/Classes/CISDOBIpadServiceManager.h | 5 +++-
.../BisKit/Classes/CISDOBIpadServiceManager.m | 24 ++++++++++++++-----
.../Tests/CISDOBIpadServiceManagerTest.m | 2 +-
3 files changed, 23 insertions(+), 8 deletions(-)
diff --git a/openbis-ipad/BisKit/Classes/CISDOBIpadServiceManager.h b/openbis-ipad/BisKit/Classes/CISDOBIpadServiceManager.h
index 6cac92e2859..78ea6764b45 100644
--- a/openbis-ipad/BisKit/Classes/CISDOBIpadServiceManager.h
+++ b/openbis-ipad/BisKit/Classes/CISDOBIpadServiceManager.h
@@ -62,7 +62,10 @@
- (NSArray *)entitiesByPermId:(NSArray *)permIds error:(NSError **)error;
- (NSArray *)entitiesNotUpdatedSince:(NSDate *)date error:(NSError **)error;
-- (NSFetchRequest *)entityFetchRequest;
+- (NSFetchRequest *)fetchRequestForEntities;
+- (NSFetchRequest *)fetchRequestForEntitiesByPermId:(NSArray *)permIds;
+- (NSFetchRequest *)fetchRequestForEntitiesNotUpdatedSince:(NSDate *)date;
+
- (NSArray *)executeFetchRequest:(NSFetchRequest *)fetchRequest error:(NSError **)error;
@end
diff --git a/openbis-ipad/BisKit/Classes/CISDOBIpadServiceManager.m b/openbis-ipad/BisKit/Classes/CISDOBIpadServiceManager.m
index 38d4f114933..3163a053e49 100644
--- a/openbis-ipad/BisKit/Classes/CISDOBIpadServiceManager.m
+++ b/openbis-ipad/BisKit/Classes/CISDOBIpadServiceManager.m
@@ -165,25 +165,23 @@ static NSManagedObjectContext* GetMainThreadManagedObjectContext(NSURL* storeUrl
- (NSArray *)allIpadEntitiesOrError:(NSError **)error;
{
- NSFetchRequest* request = self.entityFetchRequest;
+ NSFetchRequest* request = [self fetchRequestForEntities];
return [self executeFetchRequest: request error: error];
}
- (NSArray *)entitiesByPermId:(NSArray *)permIds error:(NSError **)error
{
- NSDictionary *fetchVariables = [NSDictionary dictionaryWithObject: permIds forKey: @"PERM_IDS"];
- NSFetchRequest *request = [self.managedObjectModel fetchRequestFromTemplateWithName: @"EntitiesByPermIds" substitutionVariables: fetchVariables];
+ NSFetchRequest *request = [self fetchRequestForEntitiesByPermId: permIds];
return [self executeFetchRequest: request error: error];
}
- (NSArray *)entitiesNotUpdatedSince:(NSDate *)date error:(NSError **)error
{
- NSDictionary *fetchVariables = [NSDictionary dictionaryWithObject: date forKey: @"LAST_UPDATE_DATE"];
- NSFetchRequest *request = [self.managedObjectModel fetchRequestFromTemplateWithName: @"EntitiesNotUpdatedSince" substitutionVariables: fetchVariables];
+ NSFetchRequest *request = [self fetchRequestForEntitiesNotUpdatedSince: date];
return [self executeFetchRequest: request error: error];
}
-- (NSFetchRequest *)entityFetchRequest
+- (NSFetchRequest *)fetchRequestForEntities
{
NSFetchRequest *request = [[NSFetchRequest alloc] init];
[request setEntity: self.ipadEntityDescription];
@@ -195,6 +193,20 @@ static NSManagedObjectContext* GetMainThreadManagedObjectContext(NSURL* storeUrl
return [self.managedObjectContext executeFetchRequest: fetchRequest error: error];
}
+- (NSFetchRequest *)fetchRequestForEntitiesByPermId:(NSArray *)permIds
+{
+ NSDictionary *fetchVariables = [NSDictionary dictionaryWithObject: permIds forKey: @"PERM_IDS"];
+ NSFetchRequest *request = [self.managedObjectModel fetchRequestFromTemplateWithName: @"EntitiesByPermIds" substitutionVariables: fetchVariables];
+ return request;
+}
+
+- (NSFetchRequest *)fetchRequestForEntitiesNotUpdatedSince:(NSDate *)date
+{
+ NSDictionary *fetchVariables = [NSDictionary dictionaryWithObject: date forKey: @"LAST_UPDATE_DATE"];
+ NSFetchRequest *request = [self.managedObjectModel fetchRequestFromTemplateWithName: @"EntitiesNotUpdatedSince" substitutionVariables: fetchVariables];
+ return request;
+}
+
@end
@implementation CISDOBIpadServiceManagerCall
diff --git a/openbis-ipad/BisKit/Tests/CISDOBIpadServiceManagerTest.m b/openbis-ipad/BisKit/Tests/CISDOBIpadServiceManagerTest.m
index 2c7b914f157..31e6efbb7ee 100644
--- a/openbis-ipad/BisKit/Tests/CISDOBIpadServiceManagerTest.m
+++ b/openbis-ipad/BisKit/Tests/CISDOBIpadServiceManagerTest.m
@@ -58,7 +58,7 @@
- (NSArray *)entitiesWithChildren
{
NSError *error;
- NSFetchRequest* request = self.serviceManager.entityFetchRequest;
+ NSFetchRequest* request = [self.serviceManager fetchRequestForEntities];
NSArray *elements = [self.serviceManager executeFetchRequest: request error: &error];
--
GitLab