gnustep/libs-gdl2
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gdl2.git synced 2025-04-22 12:55:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

* EOAccess/EODatabaseOperation.m

Browse source 
fix typo in string
* EOAccess/EODatabaseContext.m
add compareUsingEntityNames()
-orderAdaptorOperations
refactor
-entityNameOrderingArrayForEntities:
implemented
* EOControl/EOMutableKnownKeyDictionary.m
remove log



git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gdl2/trunk@30911 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Dave Wetzel 2010-07-02 04:12:26 +00:00
parent 4d27bfcdab
commit 225e4c3054
4 changed files with 127 additions and 103 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
ChangeLog
View file

@ -1,3 +1,15 @@
2010-07-01 David Wetzel <dave@turbocat.de>
* EOAccess/EODatabaseOperation.m
fix typo in string
* EOAccess/EODatabaseContext.m
add compareUsingEntityNames()
-orderAdaptorOperations
refactor
-entityNameOrderingArrayForEntities:
implemented
* EOControl/EOMutableKnownKeyDictionary.m
remove log
2010-07-01 David Wetzel <dave@turbocat.de>
* EOAccess/EODatabaseOperation.h
add comment

214
EOAccess/EODatabaseContext.m
View file

@ -4406,106 +4406,96 @@ Raises an exception is the adaptor is unable to perform the operations.
attributes: attributes];
}
static NSComparisonResult
compareUsingEntityNames(id left, id right, void* vpSortOrders)
{
NSArray * sortOrders = (NSArray *)vpSortOrders;
EOAdaptorOperation * leftOp = (EOAdaptorOperation*) left;
EOAdaptorOperation * rightOp = (EOAdaptorOperation*) right;
NSString * leftName = [[leftOp entity] name];
NSString * rightName = [[rightOp entity] name];
NSUInteger leftIndex;
NSUInteger rightIndex;
leftIndex = [sortOrders indexOfObject:leftName];
rightIndex = [sortOrders indexOfObject:rightName];
if (leftIndex < rightIndex) {
return NSOrderedAscending;
}
if (leftIndex > rightIndex) {
return NSOrderedDescending;
} else {
EOAdaptorOperator leftOperator = [leftOp adaptorOperator];
EOAdaptorOperator rightOperator = [rightOp adaptorOperator];
if (leftOperator < rightOperator) {
return NSOrderedAscending;
}
if (leftOperator > rightOperator) {
return NSOrderedDescending;
}
}
return NSOrderedSame;
}
- (NSArray*) orderAdaptorOperations
{
//seems OK
NSMutableArray *orderedAdaptorOpe = (NSMutableArray*)[NSMutableArray array];
//MIRKO
if (_delegateRespondsTo.willOrderAdaptorOperations == YES)
orderedAdaptorOpe = (NSMutableArray*)
[_delegate databaseContext: self
willOrderAdaptorOperationsFromDatabaseOperations:
NSAllMapTableValues(_dbOperationsByGlobalID)];
else
NSMutableArray * orderedAdaptorOpe = nil;
if (_delegateRespondsTo.willOrderAdaptorOperations == YES) {
orderedAdaptorOpe = (NSMutableArray*) [_delegate databaseContext: self
willOrderAdaptorOperationsFromDatabaseOperations:
NSAllMapTableValues(_dbOperationsByGlobalID)];
} else {
NSMutableArray * entities = [NSMutableArray array];
// NSMutableArray * adaptorOperations = [NSMutableArray array];
NSMapEnumerator dbOpeEnum;
EOGlobalID * gid = nil;
EODatabaseOperation * dbOpe = nil;
NSArray * entityNameOrderingArray = nil;
// NSHashTable * entitiesHashTable = NSCreateHashTable(NSNonOwnedPointerHashCallBacks,32);
orderedAdaptorOpe = (NSMutableArray*)[NSMutableArray array];
dbOpeEnum = NSEnumerateMapTable(_dbOperationsByGlobalID);
while (NSNextMapEnumeratorPair(&dbOpeEnum, (void **)&gid,
(void **)&dbOpe))
{
NSArray *entities = nil;
NSMutableArray *adaptorOperations = [NSMutableArray array];
NSMapEnumerator dbOpeEnum;
EOGlobalID *gid = nil;
EODatabaseOperation *dbOpe = nil;
NSHashTable *entitiesHashTable = NSCreateHashTable(NSNonOwnedPointerHashCallBacks,32);
dbOpeEnum = NSEnumerateMapTable(_dbOperationsByGlobalID);
while (NSNextMapEnumeratorPair(&dbOpeEnum, (void **)&gid,
(void **)&dbOpe))
{
NSArray *dbOpeAdaptorOperations = [dbOpe adaptorOperations];
int count = [dbOpeAdaptorOperations count];
if (count>0)
{
IMP oaiIMP=[dbOpeAdaptorOperations methodForSelector: @selector(objectAtIndex:)];
int i=0;
for (i = 0; i < count; i++)
{
EOAdaptorOperation *adaptorOpe = GDL2_ObjectAtIndexWithImp(dbOpeAdaptorOperations,oaiIMP,i);
EOEntity *entity = nil;
NSDebugMLLog(@"EODatabaseContext", @"adaptorOpe=%@",
adaptorOpe);
[adaptorOperations addObject: adaptorOpe];
entity = [adaptorOpe entity];
NSHashInsertIfAbsent(entitiesHashTable, entity);
}
};
}
entities = NSAllHashTableObjects(entitiesHashTable);
NSFreeHashTable(entitiesHashTable);
entitiesHashTable = NULL;
NSArray *dbOpeAdaptorOperations = [dbOpe adaptorOperations];
NSUInteger operCount = 0;
NSUInteger idx = 0;
if (dbOpeAdaptorOperations)
{
NSArray *entityNameOrderingArray = [self entityNameOrderingArrayForEntities:entities];
int iAdaptoOpe = 0;
int adaptorOpeCount = [adaptorOperations count];
int entitiesCount = [entityNameOrderingArray count];
if (entitiesCount>0)
{
IMP entityObjectAtIndexIMP=[entityNameOrderingArray methodForSelector: @selector(objectAtIndex:)];
IMP opeObjectAtIndexIMP=[adaptorOperations methodForSelector: @selector(objectAtIndex:)];
int iEntity=0;
for (iEntity = 0; iEntity < entitiesCount; iEntity++)
{
EOEntity *entity = GDL2_ObjectAtIndexWithImp(entityNameOrderingArray,entityObjectAtIndexIMP,iEntity);
for (iAdaptoOpe = 0; iAdaptoOpe < adaptorOpeCount; iAdaptoOpe++)
{
EOAdaptorOperation *adaptorOpe = GDL2_ObjectAtIndexWithImp(adaptorOperations,opeObjectAtIndexIMP,iAdaptoOpe);
EOEntity *opeEntity = [adaptorOpe entity];
if (opeEntity == entity)
[orderedAdaptorOpe addObject: adaptorOpe];
}
}
};
NSAssert2([orderedAdaptorOpe count] == adaptorOpeCount,
@"Different ordered (%d) an unordered adaptor operations count (%d)",
[orderedAdaptorOpe count],
adaptorOpeCount);
[orderedAdaptorOpe addObjectsFromArray:dbOpeAdaptorOperations];
operCount = [dbOpeAdaptorOperations count];
}
while (idx < operCount)
{
EOEntity * entity = [[dbOpeAdaptorOperations objectAtIndex:idx] entity];
if (([entities indexOfObject:entity] == NSNotFound))
{
[entities addObject:entity];
}
idx++;
}
}
return orderedAdaptorOpe;
NSEndMapTableEnumeration(&dbOpeEnum);
entityNameOrderingArray = [self entityNameOrderingArrayForEntities:entities];
[orderedAdaptorOpe sortUsingFunction:compareUsingEntityNames
context:entityNameOrderingArray];
}
return orderedAdaptorOpe;
}
- (NSArray*) entitiesOnWhichThisEntityDepends: (EOEntity*)entity
@ -4588,6 +4578,10 @@ Raises an exception is the adaptor is unable to perform the operations.
return entities;
}
/* this is private. it seems other implementations are doing much more
* than this.
*/
- (NSArray*)entityNameOrderingArrayForEntities: (NSArray*)entities
{
//TODO
@ -4864,14 +4858,34 @@ Raises an exception is the adaptor is unable to perform the operations.
intoOrderingArray: (NSMutableArray*)orderingArray
withDependencies: (NSDictionary*)dependencies
processingSet: (NSMutableSet*)processingSet
{
//TODO: manage dependencies {CustomerCredit = (<EOEntity name: Customer>); }
// and processingSet
[orderingArray addObject: entity];
[processingSet addObject: [entity name]];
{
NSString * entityName = [entity name];
if ((([orderingArray indexOfObject:entityName] == NSNotFound)) &&
(![processingSet containsObject:entityName]))
{
NSUInteger depCount = 0;
NSUInteger idx = 0;
NSArray * dependenciesForEntity = [dependencies objectForKey:entityName];
[processingSet addObject:entityName];
if (dependenciesForEntity) {
depCount = [dependenciesForEntity count];
}
for (; idx < depCount; idx++)
{
[self insertEntity:[dependenciesForEntity objectAtIndex:idx]
intoOrderingArray:orderingArray
withDependencies:dependencies
processingSet:processingSet];
}
[orderingArray addObject:entityName];
}
}
- (void) processSnapshotForDatabaseOperation: (EODatabaseOperation*)dbOpe
{
//Near OK

2
EOAccess/EODatabaseOperation.m
View file

@ -345,7 +345,7 @@ RCS_ID("$Id$")
break;
default:
operatorString = @"Unknwon";
operatorString = @"Unknown";
break;
}

2
EOControl/EOMutableKnownKeyDictionary.m
View file

@ -465,9 +465,7 @@ RCS_ID("$Id$")
extraBytes,
zone);
NSLog(@"before [subsetMapping init] (%p)",subsetMapping);
[subsetMapping init];
NSLog(@"after [subsetMapping init]");
ASSIGN(subsetMapping-> _sourceDescription,source);
ASSIGN(subsetMapping-> _destinationDescription,destination);