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

Remove lots of logging.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gdl2/trunk@30496 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Dave Wetzel 2010-05-30 19:25:53 +00:00
parent 021d9c6759
commit 1935fd8e22
39 changed files with 1065 additions and 1012 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
ChangeLog
View file

@ -1,3 +1,61 @@
2010-05-30 David Wetzel <dave@turbocat.de>
* EOAccess/EOModel.m
* EOAccess/EOAttribute.m
* EOAccess/EODatabase.m
* EOAccess/EOModelGroup.m
* EOAccess/EOAccessFault.m
* EOAccess/EOAdaptorOperation.m
* EOAccess/EOEntity.m
* EOAccess/EODatabaseOperation.m
* EOAccess/EOAdaptor.m
* EOAccess/EOSQLQualifier.m
* EOAccess/EODatabaseDataSource.m
* EOAccess/EOExpressionArray.m
* EOAccess/EOAdaptorContext.m
* EOAccess/EORelationship.m
* EOAccess/EODatabaseContext.m
* EOAccess/EOUtilities.m
* EOAccess/EOSchemaGeneration.m
* EOAccess/EOAdaptorChannel.m
* EOAccess/EODatabaseChannel.m
* EOControl/EOMutableKnownKeyDictionary.m
* EOControl/EOEditingContext.m
* EOControl/EODataSource.m
* EOControl/EOAndQualifier.m
* EOControl/EOKeyValueArchiver.m
* EOControl/EOFaultHandler.m
* EOControl/EOGenericRecord.m
* EOControl/EOKeyComparisonQualifier.m
* EOControl/EODetailDataSource.m
* EOControl/EOCheapArray.m
* EOControl/EOKeyValueQualifier.m
* EOControl/EOObjectStoreCoordinator.m
* EOControl/EOUndoManager.m
* EOControl/EOClassDescription.m
* EOControl/EOKeyValueCoding.m
* EOControl/EONull.m
* EOControl/EOGlobalID.m
* EOControl/EOSortOrdering.m
* EOControl/EOOrQualifier.m
Remove lots of logging.
2010-05-30 David Wetzel <dave@turbocat.de>
* EOAccess/EOAttribute.m
added attributeWithParent: definition: convenience method
* EOAccess/EOAdaptorContext.m
_channelDidInit: setDelegate
* EOAccess/EODatabaseContext.m
availableChannel: call registerChannel
new method _fetchRawRowKeyPaths:fetchSpecification:entity:editingContext:
* EOAccess/EODatabaseChannel.m
raise NSInvalidArgumentException in init.
initWithDatabaseContext: more checks
* EOAdaptors/PostgreSQLAdaptor/PostgreSQLContext.m
beginTransaction: more checks, raise NSInternalInconsistencyException
2010-05-26 David Wetzel <dave@turbocat.de>
* EOAccess/EOEntity.m
added support for stored procedures

21
EOAccess/EOAccessFault.m
View file

@ -169,13 +169,13 @@ NSString *EOAccessFaultObjectNotAvailableException = @"EOAccessFaultObjectNotAva
{
if ((self = [self init]))
{
EOFLOGObjectFnStartOrCond(@"EOAccesFaultHandler");
ASSIGNCOPY(gid, globalID);
ASSIGN(databaseContext, dbcontext);
ASSIGN(editingContext, ec);
EOFLOGObjectFnStopOrCond(@"EOAccesFaultHandler");
}
return self;
@ -198,11 +198,6 @@ NSString *EOAccessFaultObjectNotAvailableException = @"EOAccessFaultObjectNotAva
- (EOKeyGlobalID *)globalID
{
#ifdef DEBUG
EOFLOGObjectFnStartOrCond(@"EOAccesFaultHandler");
EOFLOGObjectFnStopOrCond(@"EOAccesFaultHandler");
#endif
return gid;
}
@ -218,7 +213,7 @@ NSString *EOAccessFaultObjectNotAvailableException = @"EOAccessFaultObjectNotAva
- (void)completeInitializationOfObject:(id)anObject
{
EOFLOGObjectFnStart();
// We want to be sure that we will not be autoreleased
// in an autorelease pool of another thread!
@ -240,7 +235,7 @@ NSString *EOAccessFaultObjectNotAvailableException = @"EOAccessFaultObjectNotAva
[self unableToFaultObject: anObject
databaseContext: databaseContext];
}
EOFLOGObjectFnStop();
}
- (BOOL)shouldPerformInvocation: (NSInvocation *)invocation
@ -265,7 +260,7 @@ NSString *EOAccessFaultObjectNotAvailableException = @"EOAccessFaultObjectNotAva
if ([handler respondsToSelector: @selector(globalID)])
globalID = [(EOAccessFaultHandler *)handler globalID];
NSDebugMLLog(@"gsdb", @"Fault Handler=%@ (%@)", handler, [handler class]);
[NSException raise: EOAccessFaultObjectNotAvailableException
format: @"%@ -- %@ 0x%x: cannot fault to-one for object %@ of class %@ databaseContext %@ handler %@ (globalID=%@)",
@ -357,7 +352,7 @@ NSString *EOAccessFaultObjectNotAvailableException = @"EOAccessFaultObjectNotAva
- (void)completeInitializationOfObject: (id)anObject
{
EOFLOGObjectFnStart();
// We want to be sure that we will not be autoreleased
// in an autorelease pool of another thread!
@ -366,8 +361,8 @@ NSString *EOAccessFaultObjectNotAvailableException = @"EOAccessFaultObjectNotAva
[databaseContext _fireArrayFault: anObject];
[(EOCheapCopyMutableArray *)anObject _setCopy: NO];
NSDebugMLLog(@"gsdb", @"anObject %p=%@", anObject, anObject);
EOFLOGObjectFnStop();
/*MIRKO replaced
[databaseContext _batchToMany:anObject

20
EOAccess/EOAdaptor.m
View file

@ -373,11 +373,11 @@ static struct { NSString *name; NSStringEncoding encoding; } encodingMap[] = {
fileNames = [defaultManager directoryContentsAtPath: searchPath];
filesEnum = [fileNames objectEnumerator];
NSDebugMLLog(@"EOAdaptor", @"path = %@", searchPath);
while ((fileName = [filesEnum nextObject]))
{
NSDebugMLLog(@"EOAdaptor", @"fileName = %@", fileName);
if ([fileName hasSuffix: adaptorSuffix])
{
fileName = [fileName stringByDeletingSuffix: adaptorSuffix];
@ -458,7 +458,7 @@ static struct { NSString *name; NSStringEncoding encoding; } encodingMap[] = {
EOModel *model;
NSMutableArray *attributes = nil;
EOFLOGObjectFnStart();
bundle = [NSBundle bundleForClass: [self class]];
@ -487,7 +487,7 @@ static struct { NSString *name; NSStringEncoding encoding; } encodingMap[] = {
RELEASE(model);
}
EOFLOGObjectFnStop();
return attributes;
}
@ -599,7 +599,7 @@ static struct { NSString *name; NSStringEncoding encoding; } encodingMap[] = {
{
Class expressionClass = Nil;
EOFLOGObjectFnStart();
/* retrieve EOAdaptorQuotesExternalNames from ? or from user default */
expressionClass = _expressionClass;
@ -607,7 +607,7 @@ static struct { NSString *name; NSStringEncoding encoding; } encodingMap[] = {
if(!expressionClass)
expressionClass = [self defaultExpressionClass];
EOFLOGObjectFnStop();
return expressionClass;
}
@ -668,7 +668,7 @@ static struct { NSString *name; NSStringEncoding encoding; } encodingMap[] = {
//Should be OK
SEL valueFactoryMethod;
EOFLOGObjectFnStart();
EOFLOGObjectLevelArgs(@"gsdb", @"value=%@", value);
EOFLOGObjectLevelArgs(@"gsdb", @"attribute=%@", attribute);
@ -703,7 +703,7 @@ static struct { NSString *name; NSStringEncoding encoding; } encodingMap[] = {
attribute: attribute];
EOFLOGObjectLevelArgs(@"gsdb", @"value=%@", value);
EOFLOGObjectFnStop();
return value;
}
@ -713,7 +713,7 @@ static struct { NSString *name; NSStringEncoding encoding; } encodingMap[] = {
{
NSString *resultValue = nil;
EOFLOGObjectFnStart();
EOFLOGObjectLevelArgs(@"gsdb", @"value=%@", value);
EOFLOGObjectLevelArgs(@"gsdb", @"attribute=%@", attribute);
@ -745,7 +745,7 @@ static struct { NSString *name; NSStringEncoding encoding; } encodingMap[] = {
resultValue = value;
}
EOFLOGObjectFnStop();
return resultValue;
}

16
EOAccess/EOAdaptorChannel.m
View file

@ -189,7 +189,7 @@ inRowsDescribedByQualifier: (EOQualifier *)qualifier
NSMutableArray *attributes = nil;
BOOL isEqual = YES;
EOFLOGObjectFnStart();
EOFLOGObjectLevelArgs(@"gsdb", @"attrs=%@", attrs);
EOFLOGObjectLevelArgs(@"gsdb", @"entity=%@", entity);
EOFLOGObjectLevelArgs(@"gsdb", @"qualifier=%@" ,qualifier);
@ -254,7 +254,7 @@ inRowsDescribedByQualifier: (EOQualifier *)qualifier
qualifier];
}
EOFLOGObjectFnStop();
}
- (void)evaluateExpression: (EOSQLExpression *)expression
@ -298,8 +298,8 @@ inRowsDescribedByQualifier: (EOQualifier *)qualifier
- (NSDictionary *)primaryKeyForNewRowWithEntity: (EOEntity *)entity
{
EOFLOGObjectFnStart();
EOFLOGObjectFnStop();
return nil;//no or subclass respo ?
}
@ -486,7 +486,7 @@ inRowsDescribedByQualifier: (EOQualifier *)qualifier
EOAdaptorOperator operator;
NSDictionary *changedValues=nil;
EOFLOGObjectFnStart();
adaptorContext = [self adaptorContext];
//adaptorcontext transactionNestingLevel
@ -575,7 +575,7 @@ prepareInsertExpressionWithRow:changedValues
//end
EOFLOGObjectFnStop();
}
- (void)performAdaptorOperations: (NSArray *)adaptorOperations
@ -583,7 +583,7 @@ prepareInsertExpressionWithRow:changedValues
int i = 0;
int count = 0;
EOFLOGObjectFnStart();
count=[adaptorOperations count];
@ -628,7 +628,7 @@ prepareInsertExpressionWithRow:changedValues
NS_ENDHANDLER;
}
EOFLOGObjectFnStop();
}
@end

4
EOAccess/EOAdaptorContext.m
View file

@ -201,7 +201,7 @@ NSString *EOAdaptorContextRollbackTransactionNotification = @"EOAdaptorContextRo
- (void)transactionDidCommit
{
EOFLOGObjectFnStart();
// Decrement the transaction scope
_transactionNestingLevel--;//OK
@ -210,7 +210,7 @@ NSString *EOAdaptorContextRollbackTransactionNotification = @"EOAdaptorContextRo
postNotificationName: EOAdaptorContextCommitTransactionNotification
object: self];
EOFLOGObjectFnStop();
}
- (void)transactionDidRollback

8
EOAccess/EOAdaptorOperation.m
View file

@ -92,11 +92,11 @@ RCS_ID("$Id$")
- (void)setAdaptorOperator: (EOAdaptorOperator)adaptorOperator
{
NSDebugMLLog(@"gsdb", @"adaptorOperator=%d", adaptorOperator);
_adaptorOperator = adaptorOperator;
NSDebugMLLog(@"gsdb", @"_adaptorOperator=%d", _adaptorOperator);
}
- (EOEntity *)entity
@ -180,7 +180,7 @@ RCS_ID("$Id$")
NSString *operatorString = nil;
NSString *desc = nil;
EOFLOGObjectFnStart();
switch(_adaptorOperator)
{
@ -218,7 +218,7 @@ RCS_ID("$Id$")
_storedProcedure,
_exception];
EOFLOGObjectFnStop();
return desc;
}

8
EOAccess/EOAttribute.m
View file

@ -450,13 +450,13 @@ RCS_ID("$Id$")
{
NSString *definition = nil;
// EOFLOGObjectFnStart();
//
// EOFLOGObjectLevel(@"gsdb",@"_definitionArray:%@",_definitionArray);
definition = [_definitionArray valueForSQLExpression: nil];
// EOFLOGObjectLevel(@"gsdb",@"definition:%@",definition);
// EOFLOGObjectFnStop();
//
return definition;
}
@ -1636,7 +1636,7 @@ More details:
{
NSException *exception=nil;
EOFLOGObjectFnStart();
NSAssert(valueP, @"No value pointer");
@ -1839,7 +1839,7 @@ More details:
}
}
EOFLOGObjectFnStop();
return exception;
}

44
EOAccess/EODatabase.m
View file

@ -114,7 +114,7 @@ static NSMutableArray *databaseInstances;
//OK
- initWithAdaptor: (EOAdaptor *)adaptor
{
EOFLOGObjectFnStart();
if (!adaptor)
{
@ -139,7 +139,7 @@ static NSMutableArray *databaseInstances;
_toManySnapshots = [NSMutableDictionary new];
}
EOFLOGObjectFnStop();
return self;
}
@ -295,7 +295,7 @@ static NSMutableArray *databaseInstances;
EOEntity *entity = nil;
NSString *entityName = nil;
EOFLOGObjectFnStart();
EOFLOGObjectLevelArgs(@"EODatabaseContext", @"object=%p (of class %@)",
object, [object class]);
@ -326,7 +326,7 @@ static NSMutableArray *databaseInstances;
entity = [self entityNamed: entityName];
EOFLOGObjectLevelArgs(@"EODatabaseContext", @"entity=%p", entity);
EOFLOGObjectFnStop();
return entity;
}
@ -339,12 +339,12 @@ static NSMutableArray *databaseInstances;
- (void)setResultCache: (NSArray *)cache
forEntityNamed: (NSString *)name
{
EOFLOGObjectFnStart();
[_entityCache setObject: cache
forKey: name];
EOFLOGObjectFnStop();
}
- (void)invalidateResultCacheForEntityNamed: (NSString *)name
@ -384,7 +384,7 @@ static NSMutableArray *databaseInstances;
- (void)recordSnapshot: (NSDictionary *)snapshot
forGlobalID: (EOGlobalID *)gid
{
EOFLOGObjectFnStart();
EOFLOGObjectLevelArgs(@"EODatabaseContext", @"snapshot %p %@", snapshot, snapshot);
EOFLOGObjectLevelArgs(@"EODatabaseContext", @"gid=%@", gid);
@ -398,7 +398,7 @@ static NSMutableArray *databaseInstances;
NSAssert([_snapshots objectForKey: gid], @"SNAPSHOT not save !!");
EOFLOGObjectFnStop();
}
//"Receive EOGlobalIDChangedNotification notification"
@ -418,7 +418,7 @@ static NSMutableArray *databaseInstances;
EOGlobalID *tempGID = nil;
EOGlobalID *gid = nil;
EOFLOGObjectFnStart();
userInfo = [notification userInfo];
enumerator = [userInfo keyEnumerator];
@ -455,7 +455,7 @@ static NSMutableArray *databaseInstances;
}
}
EOFLOGObjectFnStop();
}
- (NSDictionary *)snapshotForGlobalID: (EOGlobalID *)gid
@ -470,13 +470,13 @@ static NSMutableArray *databaseInstances;
//seems OK
NSDictionary *snapshot = nil;
EOFLOGObjectFnStart();
NSAssert(gid, @"No gid");
snapshot = [_snapshots objectForKey: gid];
EOFLOGObjectFnStop();
return snapshot;
}
@ -488,7 +488,7 @@ static NSMutableArray *databaseInstances;
//OK
NSMutableDictionary *toMany = nil;
EOFLOGObjectFnStart();
NSAssert(gid,@"No snapshot");
NSAssert(gid,@"No Source Global ID");
@ -510,7 +510,7 @@ static NSMutableArray *databaseInstances;
[toMany setObject: gids
forKey: name];
EOFLOGObjectFnStop();
}
- (NSArray *)snapshotForSourceGlobalID: (EOGlobalID *)gid
@ -525,7 +525,7 @@ static NSMutableArray *databaseInstances;
- (void)forgetSnapshotForGlobalID: (EOGlobalID *)gid
{
//Seems OK
EOFLOGObjectFnStart();
NSAssert(gid,@"No Global ID");
@ -541,7 +541,7 @@ static NSMutableArray *databaseInstances;
[NSArray arrayWithObject: gid]
forKey: EOInvalidatedKey]];
EOFLOGObjectFnStop();
};
- (void)forgetSnapshotsForGlobalIDs: (NSArray*)gids
@ -549,7 +549,7 @@ static NSMutableArray *databaseInstances;
NSEnumerator *gidEnum = nil;
id gid = nil;
EOFLOGObjectFnStart();
NSAssert(gids, @"No Global IDs");
EOFLOGObjectLevelArgs(@"EODatabaseContext", @"gids=%@", gids);
@ -568,7 +568,7 @@ static NSMutableArray *databaseInstances;
userInfo: [NSDictionary dictionaryWithObject: gids
forKey: EOInvalidatedKey]];
EOFLOGObjectFnStop();
}
- (void)forgetAllSnapshots
@ -598,14 +598,14 @@ static NSMutableArray *databaseInstances;
{
//OK
//VERIFY: be sure to replace all anapshot entries if any !
EOFLOGObjectFnStart();
[_snapshots addEntriesFromDictionary: snapshots];
EOFLOGObjectLevelArgs(@"EODatabaseContext", @"self=%p _snapshots=%@",
self, _snapshots);
EOFLOGObjectFnStop();
}
- (void)recordToManySnapshots: (NSDictionary *)snapshots
@ -614,7 +614,7 @@ static NSMutableArray *databaseInstances;
NSEnumerator *keyEnum = nil;
id key = nil;
EOFLOGObjectFnStart();
EOFLOGObjectLevelArgs(@"EODatabaseContext", @"snapshots=%@", snapshots);
NSAssert(snapshots, @"No snapshots");
@ -639,7 +639,7 @@ static NSMutableArray *databaseInstances;
EOFLOGObjectLevelArgs(@"EODatabaseContext", @"snapshots=%@", snapshots);
EOFLOGObjectFnStop();
}
- (NSDictionary *)snapshots

24
EOAccess/EODatabaseChannel.m
View file

@ -243,7 +243,7 @@ RCS_ID("$Id$")
EOQualifier *qualifier = nil;
EOQualifier *schemaBasedQualifier = nil;
EOFLOGObjectFnStart();
entityName = [fetchSpecification entityName];
database = [_databaseContext database];
@ -292,7 +292,7 @@ RCS_ID("$Id$")
[self _selectWithFetchSpecification:fetchSpecification
editingContext:context];
EOFLOGObjectFnStop();
}
- (id)fetchObject
@ -301,7 +301,7 @@ RCS_ID("$Id$")
EODatabase *database=nil;
id object = nil;
EOFLOGObjectFnStart();
database = [_databaseContext database];
@ -482,7 +482,7 @@ RCS_ID("$Id$")
}
}
EOFLOGObjectFnStop();
return object;
};
@ -494,7 +494,7 @@ RCS_ID("$Id$")
- (void)cancelFetch
{
EOFLOGObjectFnStart();
[self _cancelInternalFetch];
@ -503,7 +503,7 @@ RCS_ID("$Id$")
[_fetchProperties removeAllObjects];
[_fetchSpecifications removeAllObjects];
EOFLOGObjectFnStop();
}
- (EODatabaseContext *)databaseContext
@ -564,13 +564,13 @@ RCS_ID("$Id$")
//OK
NSArray *attributesToFetch=nil;
EOFLOGObjectFnStart();
attributesToFetch = [_currentEntity _attributesToFetch];
NSAssert(_currentEntity, @"No current Entity");
EOFLOGObjectFnStop();
return attributesToFetch;
}
@ -602,14 +602,14 @@ RCS_ID("$Id$")
- (void) _cancelInternalFetch
{
//OK
EOFLOGObjectFnStart();
if ([_adaptorChannel isFetchInProgress])
{
[_adaptorChannel cancelFetch];
}
EOFLOGObjectFnStop();
}
- (void) _closeChannel
@ -648,7 +648,7 @@ RCS_ID("$Id$")
NSArray *subEntities = nil;
NSDictionary *_hints = nil;
EOFLOGObjectFnStart();
_hints = [fetch _hints];
@ -825,7 +825,7 @@ RCS_ID("$Id$")
databaseChannel:self];
EOFLOGObjectFnStop();
}
@end /* EODatabaseChannel */

640
EOAccess/EODatabaseContext.m
View file

File diff suppressed because it is too large Load diff

2
EOAccess/EODatabaseDataSource.m
View file

@ -426,7 +426,7 @@ RCS_ID("$Id$")
EOEditingContext *editingContext = nil;
NSString *fetchSpecificationName = nil;
EOFLOGObjectFnStart();
entityName = [unarchiver decodeObjectForKey: @"entityName"];
EOFLOGObjectLevelArgs(@"EODataSource",@"entityName=%@",entityName);

34
EOAccess/EODatabaseOperation.m
View file

@ -105,29 +105,29 @@ RCS_ID("$Id$")
- (NSDictionary *)dbSnapshot
{
EOFLOGObjectFnStart();
NSDebugMLLog(@"gsdb", @"dbOpe %@ snapshot %p=%@", self, _dbSnapshot, _dbSnapshot);
EOFLOGObjectFnStop();
return _dbSnapshot;
}
- (void)setDBSnapshot: (NSDictionary *)dbSnapshot
{
EOFLOGObjectFnStart();
ASSIGN(_dbSnapshot, dbSnapshot);
NSDebugMLLog(@"gsdb", @"dbOpe %@ snapshot %p=%@", self, _dbSnapshot, _dbSnapshot);
if (dbSnapshot)
[_newRow addEntriesFromDictionary: dbSnapshot];
NSDebugMLLog(@"gsdb", @"dbOpe %@", self);
EOFLOGObjectFnStop();
}
- (NSMutableDictionary *)newRow
@ -193,9 +193,9 @@ RCS_ID("$Id$")
NSEnumerator *newRowEnum = nil;
NSString *key = nil;
EOFLOGObjectFnStart();
NSDebugMLLog(@"gsdb", @"self %p=%@", self, self);
newRowEnum= [_newRow keyEnumerator];
@ -216,9 +216,9 @@ RCS_ID("$Id$")
}
}
NSDebugMLLog(@"gsdb", @"diff row %p=%@", row, row);
EOFLOGObjectFnStop();
return row;
}
@ -230,9 +230,9 @@ RCS_ID("$Id$")
EOAttribute *attr = nil;
NSEnumerator *attrsEnum = nil;
EOFLOGObjectFnStart();
NSDebugMLLog(@"gsdb", @"self %p=%@", self, self);
attrsEnum = [attributes objectEnumerator];
while ((attr = [attrsEnum nextObject]))
@ -251,9 +251,9 @@ RCS_ID("$Id$")
}
}
NSDebugMLLog(@"gsdb", @"diff row %p=%@", row, row);
EOFLOGObjectFnStop();
return row;
}
@ -324,7 +324,7 @@ RCS_ID("$Id$")
NSString *operatorString = nil;
NSString *desc = nil;
EOFLOGObjectFnStart();
switch (_databaseOperator)
{
@ -362,7 +362,7 @@ RCS_ID("$Id$")
_dbSnapshot,
_dbSnapshot];
EOFLOGObjectFnStop();
return desc;
}

70
EOAccess/EOEntity.m
View file

@ -853,7 +853,7 @@ static void performSelectorOnArrayWithEachObjectOfClass(NSArray *arr, SEL select
EOAttribute *attribute = nil;
NSDictionary *attributesByName = nil;
EOFLOGObjectFnStart();
attributesByName = [self attributesByName];
@ -869,7 +869,7 @@ static void performSelectorOnArrayWithEachObjectOfClass(NSArray *arr, SEL select
attribute = [attributesByName objectForKey: attributeName];
EOFLOGObjectFnStop();
return attribute;
}
@ -1071,7 +1071,7 @@ static void performSelectorOnArrayWithEachObjectOfClass(NSArray *arr, SEL select
- (NSArray *)classProperties
{
//OK
EOFLOGObjectFnStart();
if (_flags.classPropertiesIsLazy)
{
@ -1130,7 +1130,7 @@ static void performSelectorOnArrayWithEachObjectOfClass(NSArray *arr, SEL select
_flags.classPropertiesIsLazy = NO;
}
EOFLOGObjectFnStop();
return _classProperties;
}
@ -1138,7 +1138,7 @@ static void performSelectorOnArrayWithEachObjectOfClass(NSArray *arr, SEL select
- (NSArray *)classPropertyNames
{
//OK
EOFLOGObjectFnStart();
if (!_classPropertyNames)
{
@ -1162,7 +1162,7 @@ static void performSelectorOnArrayWithEachObjectOfClass(NSArray *arr, SEL select
[_attributesToFetch class],
_attributesToFetch);
EOFLOGObjectFnStop();
return _classPropertyNames;
}
@ -2134,7 +2134,7 @@ createInstanceWithEditingContext:globalID:zone:
- (EOClassDescription *)classDescriptionForInstances
{
EOFLOGObjectFnStart();
// EOFLOGObjectLevelArgs(@"EOEntity", @"in classDescriptionForInstances");
EOFLOGObjectLevelArgs(@"EOEntity", @"_classDescription=%@",
@ -2148,7 +2148,7 @@ createInstanceWithEditingContext:globalID:zone:
//NO ? NotifyCenter addObserver:EOEntityClassDescription selector:_eoNowMultiThreaded: name:NSWillBecomeMultiThreadedNotification object:nil
}
EOFLOGObjectFnStop();
return _classDescription;
}
@ -2168,7 +2168,7 @@ createInstanceWithEditingContext:globalID:zone:
EOEntity *entity = self;
int i, count = 0;
EOFLOGObjectFnStart();
EOFLOGObjectLevelArgs(@"EOEntity", @"path=%@", path);
@ -2203,7 +2203,7 @@ createInstanceWithEditingContext:globalID:zone:
attribute = [entity anyAttributeNamed: part];
EOFLOGObjectLevelArgs(@"EOEntity", @"resulting attribute=%@", attribute);
EOFLOGObjectFnStop();
return attribute;
}
@ -2217,7 +2217,7 @@ createInstanceWithEditingContext:globalID:zone:
NSArray *pathElements = nil;
int i, count;
EOFLOGObjectFnStart();
EOFLOGObjectLevelArgs(@"EOEntity", @"path=%@", path);
@ -2247,7 +2247,7 @@ createInstanceWithEditingContext:globalID:zone:
}
}
EOFLOGObjectFnStop();
EOFLOGObjectLevelArgs(@"EOEntity", @"relationship=%@", relationship);
@ -2329,7 +2329,7 @@ createInstanceWithEditingContext:globalID:zone:
- (Class)_classForInstances
{
EOFLOGObjectFnStart();
if (!_classForInstances)
{
@ -2352,7 +2352,7 @@ createInstanceWithEditingContext:globalID:zone:
}
}
EOFLOGObjectFnStop();
return _classForInstances;
}
@ -2407,7 +2407,7 @@ createInstanceWithEditingContext:globalID:zone:
{
//near OK
Class classForInstances = _classForInstances;
EOFLOGObjectFnStart();
//TODO:use globalID ??
if (!classForInstances)
@ -2415,7 +2415,7 @@ createInstanceWithEditingContext:globalID:zone:
classForInstances = [self _classForInstances];
}
EOFLOGObjectFnStop();
return _classForInstances;
}
@ -3605,7 +3605,7 @@ toDestinationAttributeInLastComponentOfRelationshipPath: (NSString *)path
- (NSArray*) dbSnapshotKeys
{
//OK
EOFLOGObjectFnStart();
if (!_dbSnapshotKeys)
{
@ -3626,7 +3626,7 @@ toDestinationAttributeInLastComponentOfRelationshipPath: (NSString *)path
@selector(name)]]);
}
EOFLOGObjectFnStop();
return _dbSnapshotKeys;
}
@ -3683,7 +3683,7 @@ toDestinationAttributeInLastComponentOfRelationshipPath: (NSString *)path
id objectToken = nil;
id pool = nil;
EOFLOGObjectFnStart();
EOFLOGObjectLevelArgs(@"EOEntity", @"expression=%@", description);
@ -3815,7 +3815,7 @@ toDestinationAttributeInLastComponentOfRelationshipPath: (NSString *)path
NSArray *components = nil;
int i, count = 0;
EOFLOGObjectFnStart();
EOFLOGObjectLevelArgs(@"EOEntity",@"self=%p (name=%@) path=%@",
self,[self name],path);
@ -3910,7 +3910,7 @@ toDestinationAttributeInLastComponentOfRelationshipPath: (NSString *)path
EOFLOGObjectLevelArgs(@"EOEntity", @"self=%p expressionArray=%@",
self, expressionArray);
EOFLOGObjectFnStop();
return expressionArray;
}
@ -3922,7 +3922,7 @@ toDestinationAttributeInLastComponentOfRelationshipPath: (NSString *)path
NSArray *components = nil;
int i, count = 0;
EOFLOGObjectFnStart();
EOFLOGObjectLevelArgs(@"EOEntity", @"self=%p self name=%@ propertyName=%@",
self, [self name], propertyName);
@ -4005,7 +4005,7 @@ toDestinationAttributeInLastComponentOfRelationshipPath: (NSString *)path
EOFLOGObjectLevelArgs(@"EOEntity", @"self=%p expressionArray=\"%@\"",
self, expressionArray);
EOFLOGObjectFnStop();
return expressionArray;
}
@ -4088,11 +4088,11 @@ toDestinationAttributeInLastComponentOfRelationshipPath: (NSString *)path
fromFetchInEditingContext: (EOEditingContext *)context
{
//OK
EOFLOGObjectFnStart();
[super awakeObject: object
fromFetchInEditingContext: context];
//nothing to do
EOFLOGObjectFnStop();
}
/**
@ -4115,7 +4115,7 @@ fromInsertionInEditingContext: (EOEditingContext *)context
IMP objectTSVFK=NULL;
IMP objectVFK=NULL;
EOFLOGObjectFnStart();
[super awakeObject: object
fromInsertionInEditingContext: context];
@ -4177,7 +4177,7 @@ fromInsertionInEditingContext: (EOEditingContext *)context
}
}
}
EOFLOGObjectFnStop();
}
- (EOClassDescription *)classDescriptionForDestinationKey: (NSString *)detailKey
@ -4186,7 +4186,7 @@ fromInsertionInEditingContext: (EOEditingContext *)context
EOEntity *destEntity = nil;
EORelationship *rel = nil;
EOFLOGObjectFnStart();
EOFLOGObjectLevelArgs(@"EOEntity", @"detailKey=%@", detailKey);
EOFLOGObjectLevelArgs(@"EOEntity", @"_entity name=%@", [_entity name]);
@ -4200,7 +4200,7 @@ fromInsertionInEditingContext: (EOEditingContext *)context
cd = [destEntity classDescriptionForInstances];
EOFLOGObjectLevelArgs(@"EOEntity", @"cd=%@", cd);
EOFLOGObjectFnStop();
return cd;
}
@ -4212,7 +4212,7 @@ fromInsertionInEditingContext: (EOEditingContext *)context
id obj = nil;
Class objectClass;
EOFLOGObjectFnStart();
NSAssert1(_entity, @"No _entity in %@", self);
@ -4232,7 +4232,7 @@ fromInsertionInEditingContext: (EOEditingContext *)context
globalID: globalID]);
}
EOFLOGObjectFnStop();
return obj;
}
@ -4254,7 +4254,7 @@ fromInsertionInEditingContext: (EOEditingContext *)context
EORelationship *rel = nil;
EODeleteRule deleteRule = 0;
EOFLOGObjectFnStart();
rel = [_entity relationshipNamed: relationshipKey];
EOFLOGObjectLevelArgs(@"EOEntity", @"relationship %p=%@", rel, rel);
@ -4262,7 +4262,7 @@ fromInsertionInEditingContext: (EOEditingContext *)context
deleteRule = [rel deleteRule];
EOFLOGObjectLevelArgs(@"EOEntity", @"deleteRule=%d", (int)deleteRule);
EOFLOGObjectFnStop();
return deleteRule;
}
@ -4372,13 +4372,13 @@ returns nil if there's no key in the instanceDictionaryInitializer
{
EOMutableKnownKeyDictionary* dict = nil;
EOFLOGObjectFnStart();
NSAssert(_entity,@"No entity");
dict = [_entity _dictionaryForInstanceProperties];
EOFLOGObjectFnStop();
return dict;
}

26
EOAccess/EOExpressionArray.m
View file

@ -101,11 +101,11 @@ static SEL eqSel;
- (id) init
{
EOFLOGObjectFnStart();
self = [self initWithCapacity:0];
EOFLOGObjectFnStop();
return self;
}
@ -142,7 +142,7 @@ static SEL eqSel;
infix: (NSString *)infix
suffix: (NSString *)suffix
{
EOFLOGObjectFnStart();
if ((self = [self init]))
{
@ -151,7 +151,7 @@ static SEL eqSel;
ASSIGN(_suffix, suffix);
}
EOFLOGObjectFnStop();
return self;
}
@ -253,9 +253,9 @@ static SEL eqSel;
const char *s = NULL;
const char *start=NULL;
id objectToken=nil;
EOFLOGObjectFnStart();
NSDebugMLLog(@"gsdb",@"expression=%@",expression);
NSDebugMLLog(@"gsdb",@"entity=%@",entity);
array = [[EOExpressionArray new] autorelease];
s = [expression cString];
@ -321,13 +321,13 @@ static SEL eqSel;
{
//IN eoentity persedescr
}
NSDebugMLLog(@"gsdb",@"_prefix=%@",array->_prefix);
NSDebugMLLog(@"gsdb",@"_infix=%@",array->_infix);
NSDebugMLLog(@"gsdb",@"_suffix=%@",array->_suffix);
// NSDebugMLLog(@"gsdb",@"_definition=%@",array->_definition);
NSDebugMLLog(@"gsdb",@"_realAttribute=%@",array->_realAttribute);
EOFLOGObjectFnStop();
//
return array;
}
*/

20
EOAccess/EOModel.m
View file

@ -200,7 +200,7 @@ NSString *EOEntityLoadedNotification = @"EOEntityLoadedNotification";
- (id)init
{
EOFLOGObjectFnStart();
if ((self = [super init]))
{
@ -236,7 +236,7 @@ NSString *EOEntityLoadedNotification = @"EOEntityLoadedNotification";
[EOClassDescription invalidateClassDescriptionCache];
}
EOFLOGObjectFnStop();
return self;
}
@ -432,7 +432,7 @@ NSString *EOEntityLoadedNotification = @"EOEntityLoadedNotification";
EOAttribute *attribute = nil;
int i, count;
EOFLOGObjectFnStart();
EOFLOGObjectLevelArgs(@"gsdb", @"attrName=%@", attributeName);
entityName = [NSString stringWithFormat: @"EO%@Prototypes", _adaptorName];
@ -475,7 +475,7 @@ NSString *EOEntityLoadedNotification = @"EOEntityLoadedNotification";
}
EOFLOGObjectLevelArgs(@"gsdb", @"attribute=%@", attribute);
EOFLOGObjectFnStop();
return attribute;
}
@ -1076,7 +1076,7 @@ NSString *EOEntityLoadedNotification = @"EOEntityLoadedNotification";
//TODO
NSString *notificationName = nil;
EOFLOGObjectFnStart();
notificationName = [notification name];
@ -1158,7 +1158,7 @@ NSString *EOEntityLoadedNotification = @"EOEntityLoadedNotification";
//TODO
}
EOFLOGObjectFnStop();
}
- (void) _resetPrototypeCache
@ -1195,7 +1195,7 @@ NSString *EOEntityLoadedNotification = @"EOEntityLoadedNotification";
NSString *className;
EOEntity *entity;
EOFLOGObjectFnStart();
NSAssert(aClass, @"No class");
NSAssert(_entitiesByClass, @"No _entitiesByClass");
@ -1224,7 +1224,7 @@ NSString *EOEntityLoadedNotification = @"EOEntityLoadedNotification";
NSStringFromMapTable(_entitiesByClass));
}
EOFLOGObjectFnStop();
return entity;
}
@ -1510,12 +1510,12 @@ NSString *EOEntityLoadedNotification = @"EOEntityLoadedNotification";
- (void) setModelGroup: (EOModelGroup *)group
{
EOFLOGObjectFnStart();
//call group _addSubEntitiesCache:
_group = group;
EOFLOGObjectFnStop();
}
- (void)loadAllModelObjects

32
EOAccess/EOModelGroup.m
View file

@ -108,7 +108,7 @@ static EOModelGroup *globalModelGroup = nil;
+ (EOModelGroup *)globalModelGroup
{
EOFLOGObjectFnStart();
if (globalModelGroup == nil)
{
@ -122,7 +122,7 @@ static EOModelGroup *globalModelGroup = nil;
globalModelGroup = [EOModelGroup new];
NSDebugMLLog(@"gsdb", @"globalModelGroup=%p",globalModelGroup);
[bundles addObjectsFromArray: [NSBundle allBundles]];
[bundles addObjectsFromArray: [NSBundle allFrameworks]];
@ -152,7 +152,7 @@ static EOModelGroup *globalModelGroup = nil;
}
}
EOFLOGObjectFnStop();
return globalModelGroup;
}
@ -179,7 +179,7 @@ of the mainBundle, and all bundles and frameworks loaded into the app.
{
if ((self = [super init]))
{
NSDebugMLLog(@"gsdb", @"model group=%p",self);
_modelsByName = [NSMutableDictionary new];
};
@ -228,14 +228,14 @@ of the mainBundle, and all bundles and frameworks loaded into the app.
//call model entityNames
NSString *modelName;
EOFLOGObjectFnStart();
NSDebugMLLog(@"gsdb", @"model=%p", model);
modelName = [model name];
[model setModelGroup: self];
NSDebugMLLog(@"gsdb", @"model=%p name=%@", model, modelName);
if (!modelName)
{
@ -256,29 +256,29 @@ of the mainBundle, and all bundles and frameworks loaded into the app.
[_modelsByName setObject: model
forKey: modelName];
NSDebugMLLog(@"gsdb", @"Notification for model:%p", model);
[[NSNotificationCenter defaultCenter]
postNotificationName: EOModelAddedNotification
object: model];
EOFLOGObjectFnStop();
}
- (EOModel *)addModelWithFile: (NSString *)path
{
EOModel *model;
EOFLOGObjectFnStart();
model = [EOModel modelWithContentsOfFile: path];
NSDebugMLLog(@"gsdb", @"model=%p", model);
if (model)
[self addModel: model];
EOFLOGObjectFnStop();
return model;
}
@ -421,7 +421,7 @@ of the mainBundle, and all bundles and frameworks loaded into the app.
EOModelGroup *modelGroup;
NSDictionary *userInfo;
EOFLOGObjectFnStart();
userInfo = [self userInfo];
modelGroup = [userInfo objectForKey: @"EOModelGroup"];
@ -432,7 +432,7 @@ of the mainBundle, and all bundles and frameworks loaded into the app.
[self setModelGroup: modelGroup];
}
EOFLOGObjectFnStop();
return modelGroup;
}
@ -441,7 +441,7 @@ of the mainBundle, and all bundles and frameworks loaded into the app.
{
NSMutableDictionary *userInfo;
EOFLOGObjectFnStart();
userInfo = (NSMutableDictionary *)[self userInfo];
@ -457,7 +457,7 @@ of the mainBundle, and all bundles and frameworks loaded into the app.
[self setUserInfo: userInfo];
}
EOFLOGObjectFnStop();
}
@end

80
EOAccess/EORelationship.m
View file

@ -210,7 +210,7 @@ RCS_ID("$Id$")
NSString* deleteRuleString = nil;
NSString* relationshipName;
EOFLOGObjectFnStart();
model = [owner model];
relationshipName = [propertyList objectForKey: @"name"];
@ -290,7 +290,7 @@ RCS_ID("$Id$")
}
}
EOFLOGObjectFnStop();
return self;
}
@ -300,7 +300,7 @@ RCS_ID("$Id$")
//OK for definition
NSString *definition;
EOFLOGObjectFnStart();
EOFLOGObjectLevelArgs(@"EORelationship", @"self=%@", self);
@ -427,7 +427,7 @@ RCS_ID("$Id$")
};
*/
EOFLOGObjectFnStop();
}
- (void)encodeIntoPropertyList: (NSMutableDictionary *)propertyList
@ -816,8 +816,8 @@ to know what to-many mean :-) **/
- (EODeleteRule)deleteRule
{
EOFLOGObjectFnStart();
EOFLOGObjectFnStop();
return _flags.deleteRule;
}
@ -845,7 +845,7 @@ to know what to-many mean :-) **/
EOEntity *entity;
EOEntity *relationshipDestinationEntity = nil;
EOFLOGObjectFnStart();
entity = [self entity]; //OK
relationshipDestinationEntity = [relationship destinationEntity];
@ -994,7 +994,7 @@ to know what to-many mean :-) **/
}
}
EOFLOGObjectFnStop();
return isReciprocal;
}
@ -1004,7 +1004,7 @@ relationships. Nil if none" **/
- (EORelationship *)inverseRelationship
{
//OK
EOFLOGObjectFnStart();
if (!_inverseRelationship)
{
@ -1040,7 +1040,7 @@ relationships. Nil if none" **/
NSDebugLog(@"_inverseRelationship=%@", _inverseRelationship);
}
EOFLOGObjectFnStop();
return _inverseRelationship;
}
@ -1053,7 +1053,7 @@ relationships. Nil if none" **/
NSString *name = nil;
int i, count;
EOFLOGObjectFnStart();
NSAssert([self isFlattened], @"Not Flatten Relationship");
EOFLOGObjectLevel(@"EORelationship", @"add joins");
@ -1094,7 +1094,7 @@ relationships. Nil if none" **/
[inverseRelationship _setInverseRelationship: self];
EOFLOGObjectFnStop();
return inverseRelationship;
}
@ -1107,7 +1107,7 @@ relationships. Nil if none" **/
NSArray *joins = nil;
unsigned int i, count;
EOFLOGObjectFnStart();
NSAssert(![self isFlattened], @"Flatten Relationship");
@ -1146,7 +1146,7 @@ relationships. Nil if none" **/
/* call this last to avoid calls to [_destination _setIsEdited] */
[inverseRelationship setEntity: _destination];
EOFLOGObjectFnStop();
return inverseRelationship;
}
@ -1154,7 +1154,7 @@ relationships. Nil if none" **/
- (EORelationship*) hiddenInverseRelationship
{
//OK
EOFLOGObjectFnStart();
if (!_hiddenInverseRelationship)
{
@ -1164,7 +1164,7 @@ relationships. Nil if none" **/
_hiddenInverseRelationship = [self _makeInverseRelationship];
}
EOFLOGObjectFnStop();
return _hiddenInverseRelationship;
}
@ -1311,7 +1311,7 @@ relationships. Nil if none" **/
- (void)setDefinition: (NSString *)definition
{
//Near OK
EOFLOGObjectFnStart();
EOFLOGObjectLevelArgs(@"EORelationship", @"definition=%@", definition);
@ -1362,7 +1362,7 @@ relationships. Nil if none" **/
/* Ayers: Not sure what justifies this. */
[_entity _setIsEdited];
EOFLOGObjectFnStop();
}
/**
@ -1461,7 +1461,7 @@ relationships. Nil if none" **/
EOAttribute *sourceAttribute = nil;
EOAttribute *destinationAttribute = nil;
EOFLOGObjectFnStart();
EOFLOGObjectLevelArgs(@"EORelationship", @"Add join: %@\nto %@", join, self);
@ -1594,12 +1594,12 @@ relationships. Nil if none" **/
}
}
EOFLOGObjectFnStop();
}
- (void)removeJoin: (EOJoin *)join
{
EOFLOGObjectFnStart();
[self _flushCache];
@ -1632,7 +1632,7 @@ relationships. Nil if none" **/
[self didChangeValueForKey:@"joins"];
}
EOFLOGObjectFnStop();
}
- (void)setJoinSemantic: (EOJoinSemantic)joinSemantic
@ -1728,7 +1728,7 @@ becomes "name", and "FIRST_NAME" becomes "firstName".*/
//OK
NSException *exception = nil;
EOFLOGObjectFnStart();
NSAssert(valueP, @"No value pointer");
@ -1750,7 +1750,7 @@ becomes "name", and "FIRST_NAME" becomes "firstName".*/
}
}
EOFLOGObjectFnStop();
return exception;
}
@ -1897,7 +1897,7 @@ becomes "name", and "FIRST_NAME" becomes "firstName".*/
//Seems OK
NSString *relationshipPath = nil;
EOFLOGObjectFnStart();
if ([self isFlattened])
{
@ -1919,7 +1919,7 @@ becomes "name", and "FIRST_NAME" becomes "firstName".*/
else
relationshipPath = [self name];
EOFLOGObjectFnStop();
return relationshipPath;
}
@ -1928,7 +1928,7 @@ becomes "name", and "FIRST_NAME" becomes "firstName".*/
{
BOOL isToManyToOne = NO;
EOFLOGObjectFnStart();
if ([self isFlattened])
{
@ -1984,7 +1984,7 @@ becomes "name", and "FIRST_NAME" becomes "firstName".*/
}
}
EOFLOGObjectFnStop();
return isToManyToOne;
}
@ -1992,7 +1992,7 @@ becomes "name", and "FIRST_NAME" becomes "firstName".*/
-(NSDictionary*)_sourceToDestinationKeyMap
{
//OK
EOFLOGObjectFnStart();
if (!_sourceToDestinationKeyMap)
{
@ -2002,7 +2002,7 @@ becomes "name", and "FIRST_NAME" becomes "firstName".*/
[_entity _keyMapForRelationshipPath: relationshipPath]);
}
EOFLOGObjectFnStop();
return _sourceToDestinationKeyMap;
}
@ -2015,7 +2015,7 @@ becomes "name", and "FIRST_NAME" becomes "firstName".*/
int primaryKeyAttributesCount = 0;
BOOL foreignKeyInDestination = NO;
EOFLOGObjectFnStart();
destAttributes = [self destinationAttributes];
primaryKeyAttributes = [[self destinationEntity] primaryKeyAttributes];
@ -2044,7 +2044,7 @@ becomes "name", and "FIRST_NAME" becomes "firstName".*/
}
}
EOFLOGObjectFnStop();
EOFLOGObjectLevelArgs(@"EORelationship", @"foreignKeyInDestination=%s",
(foreignKeyInDestination ? "YES" : "NO"));
@ -2078,11 +2078,11 @@ dest entity
dst entity primaryKeyAttributeNames
*/
EOFLOGObjectFnStart();
[self notImplemented: _cmd]; // TODO
EOFLOGObjectFnStop();
return NO;
};
@ -2108,7 +2108,7 @@ dst entity primaryKeyAttributeNames
EOMutableKnownKeyDictionary *foreignKey = nil;
EOMKKDSubsetMapping *sourceRowToForeignKeyMapping = nil;
EOFLOGObjectFnStart();
sourceRowToForeignKeyMapping = [self _sourceRowToForeignKeyMapping];
@ -2122,14 +2122,14 @@ dst entity primaryKeyAttributeNames
EOFLOGObjectLevelArgs(@"EORelationship", @"row=%@\nforeignKey=%@", row, foreignKey);
EOFLOGObjectFnStop();
return foreignKey;
}
- (EOMKKDSubsetMapping*) _sourceRowToForeignKeyMapping
{
EOFLOGObjectFnStart();
if (!_sourceRowToForeignKeyMapping)
{
@ -2181,7 +2181,7 @@ dst entity primaryKeyAttributeNames
_sourceRowToForeignKeyMapping);
}
EOFLOGObjectFnStop();
return _sourceRowToForeignKeyMapping;
}
@ -2365,7 +2365,7 @@ dst entity primaryKeyAttributeNames
//VERIFIED DA
int count = [_joins count];
EOFLOGObjectFnStart();
EOFLOGObjectLevelArgs(@"EORelationship", @"_joinsChanged:%@\nin %@", _joins, self);
@ -2383,7 +2383,7 @@ dst entity primaryKeyAttributeNames
_destination = nil;
}
EOFLOGObjectFnStop();
}
@end

12
EOAccess/EOSQLQualifier.m
View file

@ -175,7 +175,7 @@ RCS_ID("$Id$")
EOQualifier *returnedQualifier = self;
int qualifierCount = 0;
BOOL atLeastOneDifferentQualifier = NO; // YES if we find a changed qualifier
EOFLOGObjectFnStart();
qualifierCount = [_qualifiers count];
@ -213,7 +213,7 @@ RCS_ID("$Id$")
};
}
EOFLOGObjectFnStop();
return returnedQualifier;
}
@ -258,7 +258,7 @@ RCS_ID("$Id$")
EOQualifier *returnedQualifier = self;
int qualifierCount = 0;
BOOL atLeastOneDifferentQualifier = NO; // YES if we find a changed qualifier
EOFLOGObjectFnStart();
qualifierCount = [_qualifiers count];
@ -296,7 +296,7 @@ RCS_ID("$Id$")
};
}
EOFLOGObjectFnStop();
return returnedQualifier;
}
@ -342,7 +342,7 @@ RCS_ID("$Id$")
id key;
EORelationship *relationship;
EOFLOGObjectFnStart();
EOFLOGObjectLevelArgs(@"EOQualifier", @"self=%@", self);
@ -514,7 +514,7 @@ RCS_ID("$Id$")
EOFLOGObjectLevelArgs(@"EOQualifier", @"self=%@", self);
EOFLOGObjectLevelArgs(@"EOQualifier", @"result qualifier=%@", qualifier);
EOFLOGObjectFnStop();
return qualifier;
}

86
EOAccess/EOSchemaGeneration.m
View file

@ -205,14 +205,14 @@ NSString *EODropDatabaseKey = @"EODropDatabaseKey";
EOJoin *join;
unsigned num;
EOFLOGClassFnStartOrCond(@"EOSQLExpression");
array = [NSMutableArray arrayWithCapacity: 1];
if ([[relationship entity] model]
!= [[relationship destinationEntity] model])
{
EOFLOGClassFnStopOrCond(@"EOSQLExpression");
return array;
}
@ -221,7 +221,7 @@ NSString *EODropDatabaseKey = @"EODropDatabaseKey";
|| ([relationship inverseRelationship] != nil
&& [[relationship inverseRelationship] isToMany] == NO))
{
EOFLOGClassFnStopOrCond(@"EOSQLExpression");
return array;
}
@ -247,7 +247,7 @@ NSString *EODropDatabaseKey = @"EODropDatabaseKey";
[array addObject: sqlExpression];
EOFLOGClassFnStopOrCond(@"EOSQLExpression");
return array;
}
@ -260,7 +260,7 @@ NSString *EODropDatabaseKey = @"EODropDatabaseKey";
EOEntity *parentEntity;
unsigned i,j,n,m;
EOFLOGClassFnStartOrCond(@"EOSQLExpression");
sqlExps = [NSMutableArray array];
@ -282,7 +282,7 @@ NSString *EODropDatabaseKey = @"EODropDatabaseKey";
}
}
EOFLOGClassFnStopOrCond(@"EOSQLExpression");
return sqlExps;
}
@ -293,7 +293,7 @@ NSString *EODropDatabaseKey = @"EODropDatabaseKey";
NSEnumerator *groupsEnum;
NSArray *group;
EOFLOGClassFnStartOrCond(@"EOSQLExpression");
array = [NSMutableArray arrayWithCapacity: [entityGroups count]];
@ -306,7 +306,7 @@ NSString *EODropDatabaseKey = @"EODropDatabaseKey";
[array addObjectsFromArray: stmts];
}
EOFLOGClassFnStopOrCond(@"EOSQLExpression");
return array;
}
@ -324,7 +324,7 @@ NSString *EODropDatabaseKey = @"EODropDatabaseKey";
NSString *tableName;
NSString *stmt;
EOFLOGClassFnStartOrCond(@"EOSQLExpression");
if ([[entityGroup objectAtIndex:0] isAbstractEntity])
return [NSArray array];
@ -349,7 +349,7 @@ NSString *EODropDatabaseKey = @"EODropDatabaseKey";
[sqlExp listString]];
[sqlExp setStatement: stmt];
EOFLOGClassFnStopOrCond(@"EOSQLExpression");
return [NSArray arrayWithObject: sqlExp];
}
@ -362,7 +362,7 @@ NSString *EODropDatabaseKey = @"EODropDatabaseKey";
NSString *stmt;
EOSQLExpression *sqlExp;
EOFLOGClassFnStartOrCond(@"EOSQLExpression");
entity = [entityGroup objectAtIndex: 0];
@ -377,7 +377,7 @@ NSString *EODropDatabaseKey = @"EODropDatabaseKey";
[sqlExp setStatement: stmt];
newArray = [NSArray arrayWithObject: sqlExp];
EOFLOGClassFnStopOrCond(@"EOSQLExpression");
return newArray;
}
@ -393,7 +393,7 @@ NSString *EODropDatabaseKey = @"EODropDatabaseKey";
NSString *stmt;
BOOL first = YES;
EOFLOGClassFnStartOrCond(@"EOSQLExpression");
entity = [entityGroup objectAtIndex: 0];
listString = [NSMutableString stringWithCapacity: 30];
@ -415,7 +415,7 @@ NSString *EODropDatabaseKey = @"EODropDatabaseKey";
if (first == YES)
{
EOFLOGClassFnStopOrCond(@"EOSQLExpression");
return [NSArray array];
}
@ -428,7 +428,7 @@ NSString *EODropDatabaseKey = @"EODropDatabaseKey";
tableName, listString];
[sqlExp setStatement: stmt];
EOFLOGClassFnStopOrCond(@"EOSQLExpression");
return [NSArray arrayWithObject: sqlExp];
}
@ -442,7 +442,7 @@ NSString *EODropDatabaseKey = @"EODropDatabaseKey";
NSString *stmt;
EOSQLExpression *sqlExp;
EOFLOGClassFnStartOrCond(@"EOSQLExpression");
entity = [entityGroup objectAtIndex: 0];
@ -459,7 +459,7 @@ NSString *EODropDatabaseKey = @"EODropDatabaseKey";
[sqlExp setStatement: stmt];
newArray = [NSArray arrayWithObject: sqlExp];
EOFLOGClassFnStopOrCond(@"EOSQLExpression");
return newArray;
}
@ -473,7 +473,7 @@ NSString *EODropDatabaseKey = @"EODropDatabaseKey";
NSString *stmt;
EOSQLExpression *sqlExp;
EOFLOGClassFnStartOrCond(@"EOSQLExpression");
entity = [entityGroup objectAtIndex: 0];
@ -490,7 +490,7 @@ NSString *EODropDatabaseKey = @"EODropDatabaseKey";
[sqlExp setStatement: stmt];
newArray = [NSArray arrayWithObject: sqlExp];
EOFLOGClassFnStopOrCond(@"EOSQLExpression");
return newArray;
}
@ -501,7 +501,7 @@ NSString *EODropDatabaseKey = @"EODropDatabaseKey";
NSEnumerator *groupsEnum;
NSArray *group;
EOFLOGClassFnStartOrCond(@"EOSQLExpression");
array = [NSMutableArray arrayWithCapacity: [entityGroups count]];
@ -512,7 +512,7 @@ NSString *EODropDatabaseKey = @"EODropDatabaseKey";
[self createTableStatementsForEntityGroup: group]];
}
EOFLOGClassFnStopOrCond(@"EOSQLExpression");
return array;
}
@ -523,7 +523,7 @@ NSString *EODropDatabaseKey = @"EODropDatabaseKey";
NSEnumerator *groupsEnum;
NSArray *group;
EOFLOGClassFnStartOrCond(@"EOSQLExpression");
array = [NSMutableArray arrayWithCapacity: [entityGroups count]];
@ -534,7 +534,7 @@ NSString *EODropDatabaseKey = @"EODropDatabaseKey";
[self dropTableStatementsForEntityGroup: group]];
}
EOFLOGClassFnStopOrCond(@"EOSQLExpression");
return array;
}
@ -545,7 +545,7 @@ NSString *EODropDatabaseKey = @"EODropDatabaseKey";
NSEnumerator *groupsEnum;
NSArray *group;
EOFLOGClassFnStartOrCond(@"EOSQLExpression");
array = [NSMutableArray arrayWithCapacity: [entityGroups count]];
@ -556,7 +556,7 @@ NSString *EODropDatabaseKey = @"EODropDatabaseKey";
[self primaryKeyConstraintStatementsForEntityGroup: group]];
}
EOFLOGClassFnStopOrCond(@"EOSQLExpression");
return array;
}
@ -567,7 +567,7 @@ NSString *EODropDatabaseKey = @"EODropDatabaseKey";
NSEnumerator *groupsEnum;
NSArray *group;
EOFLOGClassFnStartOrCond(@"EOSQLExpression");
array = [NSMutableArray arrayWithCapacity: [entityGroups count]];
@ -578,7 +578,7 @@ NSString *EODropDatabaseKey = @"EODropDatabaseKey";
[self primaryKeySupportStatementsForEntityGroup: group]];
}
EOFLOGClassFnStopOrCond(@"EOSQLExpression");
return array;
}
@ -589,7 +589,7 @@ NSString *EODropDatabaseKey = @"EODropDatabaseKey";
NSEnumerator *groupsEnum;
NSArray *group;
EOFLOGClassFnStartOrCond(@"EOSQLExpression");
array = [NSMutableArray arrayWithCapacity: [entityGroups count]];
@ -600,7 +600,7 @@ NSString *EODropDatabaseKey = @"EODropDatabaseKey";
[self dropPrimaryKeySupportStatementsForEntityGroup: group]];
}
EOFLOGClassFnStopOrCond(@"EOSQLExpression");
return array;
}
@ -608,11 +608,11 @@ NSString *EODropDatabaseKey = @"EODropDatabaseKey";
+ (void)appendExpression: (EOSQLExpression *)expression
toScript: (NSMutableString *)script
{
EOFLOGClassFnStartOrCond(@"EOSQLExpression");
[script appendFormat:@"%@;\n", [expression statement]];
EOFLOGClassFnStopOrCond(@"EOSQLExpression");
}
@ -623,7 +623,7 @@ NSString *EODropDatabaseKey = @"EODropDatabaseKey";
NSEnumerator *arrayEnum;
EOSQLExpression *sqlExp;
EOFLOGClassFnStartOrCond(@"EOSQLExpression");
arrayEnum = [[self schemaCreationStatementsForEntities: entities
options: options] objectEnumerator];
@ -631,7 +631,7 @@ NSString *EODropDatabaseKey = @"EODropDatabaseKey";
while ((sqlExp = [arrayEnum nextObject]))
[self appendExpression: sqlExp toScript: script];
EOFLOGClassFnStopOrCond(@"EOSQLExpression");
return script;
}
@ -672,7 +672,7 @@ struct _schema
{nil, nil},
}; // Order is important!
EOFLOGClassFnStartOrCond(@"EOSQLExpression");
count = [entities count];
@ -711,7 +711,7 @@ struct _schema
}
}
EOFLOGClassFnStopOrCond(@"EOSQLExpression");
return array;
}
@ -721,23 +721,23 @@ struct _schema
NSString *extType = [attribute externalType];
int precision = [attribute precision];
EOFLOGClassFnStartOrCond(@"EOSQLExpression");
if (precision)
{
EOFLOGClassFnStopOrCond(@"EOSQLExpression");
return [NSString stringWithFormat:@"%@(%d, %d)", extType, precision,
[attribute scale]];
}
else if ([attribute width])
{
EOFLOGClassFnStopOrCond(@"EOSQLExpression");
return [NSString stringWithFormat: @"%@(%d)",
extType, [attribute width]];
}
else
{
EOFLOGClassFnStopOrCond(@"EOSQLExpression");
return [NSString stringWithFormat: @"%@", extType];
}
}
@ -756,7 +756,7 @@ struct _schema
NSString *allowsNull;
NSString *str;
EOFLOGClassFnStartOrCond(@"EOSQLExpression");
columnType = [self columnTypeStringForAttribute: attribute];
allowsNull = [self allowsNullClauseForConstraint: [attribute allowsNull]];
@ -770,7 +770,7 @@ struct _schema
[self appendItem:str toListString: /*_listString*/[self listString]]; // Else no chance to get inited (lazy)
EOFLOGClassFnStopOrCond(@"EOSQLExpression");
}
- (void)prepareConstraintStatementForRelationship: (EORelationship *)relationship
@ -783,7 +783,7 @@ struct _schema
NSString *name, *str, *tableName, *relTableName;
BOOL first = YES;
EOFLOGClassFnStartOrCond(@"EOSQLExpression");
name = [NSString stringWithFormat: @"%@_%@_FK", [_entity externalName],
[relationship name]];
@ -839,7 +839,7 @@ struct _schema
ASSIGN(_statement, str);
EOFLOGClassFnStopOrCond(@"EOSQLExpression");
}
// Assembles an adaptor specific constraint statement for relationship.

70
EOAccess/EOUtilities.m
View file

@ -100,12 +100,12 @@ NSString *EOMoreThanOneException = @"EOMoreThanOneException";
EOEntity *entity;
NSArray *objects;
EOFLOGObjectFnStartOrCond(@"EOEditingContext");
entity = [self entityForClass: classObject];
objects = [self objectsForEntityNamed: [entity name]];
EOFLOGObjectFnStopOrCond(@"EOEditingContext");
return objects;
}
@ -166,7 +166,7 @@ NSString *EOMoreThanOneException = @"EOMoreThanOneException";
//OK
NSArray *objects;
EOFLOGObjectFnStart();
NSDebugMLLog(@"gsdb", @"START value=%@ key=%@ entityName=%@",
value, key, entityName);
@ -182,7 +182,7 @@ NSString *EOMoreThanOneException = @"EOMoreThanOneException";
forKey: key]
entityNamed: entityName];
EOFLOGObjectFnStop();
return objects;
//TC:
@ -191,7 +191,7 @@ NSString *EOMoreThanOneException = @"EOMoreThanOneException";
EOFetchSpecification *fetch;
NSArray *newArray;
EOFLOGObjectFnStartOrCond(@"EOEditingContext");
qualifier = [[EOKeyValueQualifier alloc]
initWithKey:key
@ -204,7 +204,7 @@ NSString *EOMoreThanOneException = @"EOMoreThanOneException";
newArray = [self objectsWithFetchSpecification:fetch];
EOFLOGObjectFnStopOrCond(@"EOEditingContext");
return newArray;
*/
@ -221,9 +221,9 @@ NSString *EOMoreThanOneException = @"EOMoreThanOneException";
id key=nil;
NSMutableArray* kvQualifiers=nil;
EOFLOGObjectFnStart();
NSDebugMLLog(@"gsdb", @"START values=%@ entityName=%@", values, entityName);
NS_DURING
{
@ -250,7 +250,7 @@ NSString *EOMoreThanOneException = @"EOMoreThanOneException";
qualifier: qualifier
sortOrderings: nil];
NSDebugMLLog(@"gsdb", @"fetchSpec=%@", fetchSpec);
objects = [self objectsWithFetchSpecification: fetchSpec];
}
NS_HANDLER
@ -267,7 +267,7 @@ NSString *EOMoreThanOneException = @"EOMoreThanOneException";
}
NS_ENDHANDLER;
EOFLOGObjectFnStop();
return objects;
//TC:
@ -380,7 +380,7 @@ NSString *EOMoreThanOneException = @"EOMoreThanOneException";
int count;
NSArray *objects;
EOFLOGObjectFnStart();
NSDebugMLLog(@"gsdb", @"START value=%@ key=%@ entityName=%@",
value, key, entityName);
@ -393,8 +393,8 @@ NSString *EOMoreThanOneException = @"EOMoreThanOneException";
forKey: key
entityNamed: entityName];
NSDebugMLLog(@"gsdb", @"objects count=%d", [objects count]);
NSDebugMLLog(@"gsdb", @"objects=%@", objects);
count = [objects count];
@ -433,9 +433,9 @@ NSString *EOMoreThanOneException = @"EOMoreThanOneException";
}
NS_ENDHANDLER;
NSDebugMLLog(@"gsdb", @"object=%@", object);
EOFLOGObjectFnStop();
return object;
}
@ -447,7 +447,7 @@ NSString *EOMoreThanOneException = @"EOMoreThanOneException";
int count;
NSArray *objects;
EOFLOGObjectFnStart();
NSAssert([entityName length] > 0, @"No entity name");
@ -476,7 +476,7 @@ NSString *EOMoreThanOneException = @"EOMoreThanOneException";
break;
}
EOFLOGObjectFnStop();
return object;
}
@ -793,7 +793,7 @@ connectionDictionaryOverrides: (NSDictionary *)overrides
id object;
EOClassDescription *classDescription;
EOFLOGObjectFnStartOrCond(@"EOEditingContext");
classDescription = [EOClassDescription classDescriptionForEntityName:
entityName];
@ -809,7 +809,7 @@ connectionDictionaryOverrides: (NSDictionary *)overrides
zone: [self zone]];
[self insertObject: object];
EOFLOGObjectFnStopOrCond(@"EOEditingContext");
return object;
}
@ -820,14 +820,14 @@ connectionDictionaryOverrides: (NSDictionary *)overrides
EOEntity *entity;
NSDictionary *newDict;
EOFLOGObjectFnStartOrCond(@"EOEditingContext");
gid = (EOKeyGlobalID *)[self globalIDForObject: object];
entity = [self entityForObject: object];
newDict = [entity primaryKeyForGlobalID: gid];
EOFLOGObjectFnStopOrCond(@"EOEditingContext");
return newDict;
}
@ -897,14 +897,14 @@ connectionDictionaryOverrides: (NSDictionary *)overrides
EOGlobalID *gid;
id newInstance;
EOFLOGObjectFnStartOrCond(@"EOEditingContext");
gid = [[object editingContext] globalIDForObject:object];
newInstance = [self faultForGlobalID: gid
editingContext: self];
EOFLOGObjectFnStopOrCond(@"EOEditingContext");
return newInstance;
}
@ -915,7 +915,7 @@ connectionDictionaryOverrides: (NSDictionary *)overrides
int i, count = [objects count];
id obj;
EOFLOGObjectFnStartOrCond(@"EOEditingContext");
array = [NSMutableArray arrayWithCapacity: count];
@ -925,7 +925,7 @@ connectionDictionaryOverrides: (NSDictionary *)overrides
[array addObject: obj];
}
EOFLOGObjectFnStopOrCond(@"EOEditingContext");
return array;
}
@ -936,7 +936,7 @@ connectionDictionaryOverrides: (NSDictionary *)overrides
EOObjectStoreCoordinator *objectStoreCoordinator;
EOModelGroup *modelGroup;
EOFLOGObjectFnStartOrCond(@"EOEditingContext");
rootObjectStore = [self rootObjectStore];
@ -948,7 +948,7 @@ connectionDictionaryOverrides: (NSDictionary *)overrides
objectStoreCoordinator = (EOObjectStoreCoordinator *)rootObjectStore;
modelGroup = [objectStoreCoordinator modelGroup];
EOFLOGObjectFnStopOrCond(@"EOEditingContext");
return modelGroup;
}
@ -958,7 +958,7 @@ connectionDictionaryOverrides: (NSDictionary *)overrides
EOEntity *entity;
EOModelGroup *modelGroup;
EOFLOGObjectFnStart();
NSAssert([entityName length] > 0, @"No entity name");
@ -973,7 +973,7 @@ connectionDictionaryOverrides: (NSDictionary *)overrides
NSStringFromSelector(_cmd),
entityName];
EOFLOGObjectFnStop();
return entity;
}
@ -992,7 +992,7 @@ connectionDictionaryOverrides: (NSDictionary *)overrides
EOEntity *result = nil;
BOOL matchesClassName;
EOFLOGObjectFnStartOrCond(@"EOEditingContext");
className = NSStringFromClass(classObject);
@ -1039,7 +1039,7 @@ connectionDictionaryOverrides: (NSDictionary *)overrides
format: @"%@ could not find entity for class named %@",
NSStringFromSelector(_cmd), className];
EOFLOGObjectFnStopOrCond(@"EOEditingContext");
return result;
}
@ -1049,7 +1049,7 @@ connectionDictionaryOverrides: (NSDictionary *)overrides
EOClassDescription *classDesc;
EOEntity *newEntity;
EOFLOGObjectFnStartOrCond(@"EOEditingContext");
classDesc = [(EOGenericRecord *)object classDescription];
@ -1061,7 +1061,7 @@ connectionDictionaryOverrides: (NSDictionary *)overrides
newEntity = [(EOEntityClassDescription *)classDesc entity];
EOFLOGObjectFnStopOrCond(@"EOEditingContext");
return newEntity;
}
@ -1077,7 +1077,7 @@ connectionDictionaryOverrides: (NSDictionary *)overrides
EOFetchSpecification *newEOFetchSpecification = nil;
EOModelGroup *anModelGroup;
EOFLOGClassFnStartOrCond(@"EOFetchSpecification");
anModelGroup = [EOModelGroup defaultGroup];
@ -1085,7 +1085,7 @@ connectionDictionaryOverrides: (NSDictionary *)overrides
newEOFetchSpecification = [anModelGroup fetchSpecificationNamed: name
entityNamed: entityName];
EOFLOGObjectFnStopOrCond(@"EOFetchSpecification");
return newEOFetchSpecification;
}

2
EOControl/EOAndQualifier.m
View file

@ -173,7 +173,7 @@ RCS_ID("$Id$")
int i = 0;
int count = [_qualifiers count];
NSMutableArray* newQualifiers = nil;
EOFLOGObjectLevelArgs(@"EOQualifier", @"bindings=%@", bindings);
for(i=0; i<count; i++)
{

4
EOControl/EOCheapArray.m
View file

@ -332,7 +332,7 @@ RCS_ID("$Id$")
- (void)addObject: (id)object
{
EOFLOGObjectFnStart();
if (!object)
{
@ -364,7 +364,7 @@ RCS_ID("$Id$")
_contents_array[_count] = RETAIN(object);
_count++; // Do this AFTER we have retained the object.
EOFLOGObjectFnStop();
}
- (void) insertObject: (id)object

86
EOControl/EOClassDescription.m
View file

@ -193,12 +193,12 @@ static NSRecursiveLock *local_lock = nil;
{
EOClassDescription* classDescription;
EOFLOGObjectFnStart();
NSDebugMLLog(@"gsdb", @"entityName=%@", entityName);
classDescription = NSMapGet(classDescriptionForEntity, entityName);
NSDebugMLLog(@"gsdb", @"classDescription=%@", classDescription);
if (!classDescription)
{
@ -207,7 +207,7 @@ static NSRecursiveLock *local_lock = nil;
object: entityName];
classDescription = NSMapGet(classDescriptionForEntity, entityName);
NSDebugMLLog(@"gsdb", @"classDescription=%@", classDescription);
if (!classDescription)
{
@ -216,7 +216,7 @@ static NSRecursiveLock *local_lock = nil;
}
}
EOFLOGObjectFnStop();
return classDescription;
}
@ -232,34 +232,34 @@ static NSRecursiveLock *local_lock = nil;
{
NSString *entityName;
EOFLOGObjectFnStart();
NSAssert(description, @"No class description");
NSAssert(aClass, @"No class");
NSDebugMLLog(@"gsdb", @"description=%@", description);
entityName = [description entityName];
//NSAssert(entityName,@"No Entity Name");
NSDebugMLLog(@"gsdb", @"entityName=%@", entityName);
NSMapInsert(classDescriptionForClass, aClass, description);
if (entityName)
{
NSMapInsert(classDescriptionForEntity, entityName, description);
}
NSDebugMLLog(@"gsdb", @"end");
EOFLOGObjectFnStop();
}
+ (void)setClassDelegate:(id)delegate
{
EOFLOGObjectFnStart();
NSDebugMLLog(@"gsdb",@"delegate %p=%@", delegate, delegate);
classDelegate = delegate;
EOFLOGObjectFnStop();
}
- (NSArray *)attributeKeys
@ -277,7 +277,7 @@ static NSRecursiveLock *local_lock = nil;
NSMutableArray* classPropertyNames=nil;
NSMutableDictionary* dictionary=nil;
EOFLOGObjectFnStart();
// Get class properties (attributes + relationships)
classPropertyNames = [[NSMutableArray alloc]
@ -295,7 +295,7 @@ static NSRecursiveLock *local_lock = nil;
[[EOMKKDInitializer newWithKeyArray: classPropertyNames] autorelease]];
[classPropertyNames release];
EOFLOGObjectFnStop();
return dictionary;
}
@ -315,7 +315,7 @@ fromInsertionInEditingContext: (EOEditingContext *)editingContext
NSArray *toManyRelationshipKeys = nil;
int toManyCount = 0;
EOFLOGObjectFnStart();
toManyRelationshipKeys = [self toManyRelationshipKeys];
toManyCount = [toManyRelationshipKeys count];
@ -331,7 +331,7 @@ fromInsertionInEditingContext: (EOEditingContext *)editingContext
{
id key = GDL2_ObjectAtIndexWithImpPtr(toManyRelationshipKeys,&oaiIMP,i);
id value = GDL2_StoredValueForKeyWithImpPtr(object,&objectSVFK,key);
NSDebugMLLog(@"gsdb", @"key=%@ value=%@",key,value);
if (value)
{
@ -345,7 +345,7 @@ fromInsertionInEditingContext: (EOEditingContext *)editingContext
}
}
}
EOFLOGObjectFnStop();
}
- (EOClassDescription *)classDescriptionForDestinationKey: (NSString *)detailKey
@ -357,8 +357,8 @@ fromInsertionInEditingContext: (EOEditingContext *)editingContext
globalID: (EOGlobalID *)globalID
zone: (NSZone *)zone
{
EOFLOGObjectFnStart();
EOFLOGObjectFnStop();
return nil;
}
@ -376,8 +376,8 @@ fromInsertionInEditingContext: (EOEditingContext *)editingContext
- (EODeleteRule)deleteRuleForRelationshipKey: (NSString *)relationshipKey
{
//OK
EOFLOGObjectFnStart();
EOFLOGObjectFnStop();
return EODeleteRuleNullify;
}
@ -444,9 +444,9 @@ fromInsertionInEditingContext: (EOEditingContext *)editingContext
id destination = nil;
id classDelegate;
EOFLOGObjectFnStart();
NSDebugMLLog(@"gsdb",@"object %p=%@", object, object);
if (object==GDL2_EONull)
{
@ -471,7 +471,7 @@ fromInsertionInEditingContext: (EOEditingContext *)editingContext
{
BOOL shouldPropagate = YES;
NSDebugMLLog(@"gsdb", @"ToOne key=%@", key);
if (classDelegate)
{
@ -495,12 +495,12 @@ fromInsertionInEditingContext: (EOEditingContext *)editingContext
EODeleteRule deleteRule = [object deleteRuleForRelationshipKey:
key];
NSDebugMLLog(@"gsdb", @"deleteRule=%d", (int)deleteRule);
switch (deleteRule)
{
case EODeleteRuleNullify:
EOFLOGObjectLevel(@"gsdb", @"EODeleteRuleNullify");
[(EOCustomObject*) object removeObject: destination
fromBothSidesOfRelationshipWithKey: key];
@ -508,7 +508,7 @@ fromInsertionInEditingContext: (EOEditingContext *)editingContext
[object takeValue:nil
forKey:key];
inverseKey = [object inverseForRelationshipKey:key];
NSDebugMLLog(@"gsdb",@"inverseKey=%@",inverseKey);
if (inverseKey)
// p.ex. : the statement [employee inverseForRelationshipKey:@"department"] --> returns "employees"
@ -519,7 +519,7 @@ fromInsertionInEditingContext: (EOEditingContext *)editingContext
case EODeleteRuleCascade:
//OK
EOFLOGObjectLevel(@"gsdb", @"EODeleteRuleCascade");
[object removeObject: destination
fromBothSidesOfRelationshipWithKey: key];
[editingContext deleteObject: destination];
@ -527,7 +527,7 @@ fromInsertionInEditingContext: (EOEditingContext *)editingContext
break;
case EODeleteRuleDeny:
EOFLOGObjectLevel(@"gsdb", @"EODeleteRuleDeny");
// TODO don't know how to do yet, if raise an exception
// or something else.
NSEmitTODO();
@ -535,7 +535,7 @@ fromInsertionInEditingContext: (EOEditingContext *)editingContext
break;
case EODeleteRuleNoAction:
EOFLOGObjectLevel(@"gsdb", @"EODeleteRuleNoAction");
break;
}
}
@ -550,7 +550,7 @@ fromInsertionInEditingContext: (EOEditingContext *)editingContext
{
BOOL shouldPropagate = YES;
NSDebugMLLog(@"gsdb", @"ToMany key=%@", key);
if (classDelegate)
{
@ -569,15 +569,15 @@ fromInsertionInEditingContext: (EOEditingContext *)editingContext
EODeleteRule deleteRule;
toManyArray = GDL2_ValueForKeyWithImpPtr(object,&objectVFK,key);
NSDebugMLLog(@"gsdb", @"toManyArray %p=%@", toManyArray, toManyArray);
deleteRule = [object deleteRuleForRelationshipKey: key];
NSDebugMLLog(@"gsdb", @"deleteRule=%d", (int)deleteRule);
switch (deleteRule)
{
case EODeleteRuleNullify:
EOFLOGObjectLevel(@"gsdb", @"EODeleteRuleNullify");
NSDebugMLLog(@"gsdb", @"toManyArray %p=%@", toManyArray,
toManyArray);
@ -590,7 +590,7 @@ fromInsertionInEditingContext: (EOEditingContext *)editingContext
fromBothSidesOfRelationshipWithKey: key];
/*
inverseKey = [self inverseForRelationshipKey:key];
NSDebugMLLog(@"gsdb",@"inverseKey=%@",inverseKey);
if (inverseKey)
[destination removeObject:object
@ -603,7 +603,7 @@ fromInsertionInEditingContext: (EOEditingContext *)editingContext
case EODeleteRuleCascade:
//OK
EOFLOGObjectLevel(@"gsdb", @"EODeleteRuleCascade");
NSDebugMLLog(@"gsdb", @"toManyArray %p=%@",
toManyArray, toManyArray);
@ -622,7 +622,7 @@ fromInsertionInEditingContext: (EOEditingContext *)editingContext
break;
case EODeleteRuleDeny:
EOFLOGObjectLevel(@"gsdb", @"EODeleteRuleDeny");
NSDebugMLLog(@"gsdb", @"toManyArray %p=%@",
toManyArray, toManyArray);
if ([toManyArray count] > 0)
@ -635,14 +635,14 @@ fromInsertionInEditingContext: (EOEditingContext *)editingContext
break;
case EODeleteRuleNoAction:
EOFLOGObjectLevel(@"gsdb", @"EODeleteRuleNoAction");
break;
}
}
}
}
EOFLOGObjectFnStop();
}
- (NSArray *)toManyRelationshipKeys
@ -714,13 +714,13 @@ fromInsertionInEditingContext: (EOEditingContext *)editingContext
+ (void)setDelegate: (id)delegate
{
EOFLOGObjectFnStart();
NSDebugMLLog(@"gsdb", @"delegate %p=%@", delegate, delegate);
[EOClassDescription setClassDelegate: delegate];
EOFLOGObjectFnStop();
}
+ (id)delegate

8
EOControl/EODataSource.m
View file

@ -57,21 +57,21 @@ RCS_ID("$Id$")
EOClassDescription *cd;
EOEditingContext *receiverEdCtxt;
EOFLOGObjectFnStart();
cd = [self classDescriptionForObjects];
EOFLOGObjectLevelArgs(@"EODataSource", @"cd=%@", cd);
object = [cd createInstanceWithEditingContext: nil
globalID: nil
zone: NULL];
EOFLOGObjectLevelArgs(@"EODataSource", @"object=%@", object);
if (object && (receiverEdCtxt = [self editingContext]))
[receiverEdCtxt insertObject: object];
EOFLOGObjectFnStop();
return object;
}

22
EOControl/EODetailDataSource.m
View file

@ -91,7 +91,7 @@ RCS_ID("$Id$")
- (id)initWithKeyValueUnarchiver: (EOKeyValueUnarchiver *)unarchiver
{
//OK
EOFLOGObjectFnStart();
if ((self = [self init]))
{
@ -99,7 +99,7 @@ RCS_ID("$Id$")
NSString* masterClassDescriptionName=nil;
EOClassDescription* masterClassDescription=nil;
EOFLOGObjectLevelArgs(@"EODataSource",@"EODetailDataSource %p",self);
detailKey = [unarchiver decodeObjectForKey: @"detailKey"];
masterClassDescriptionName = [unarchiver decodeObjectForKey:
@ -116,7 +116,7 @@ RCS_ID("$Id$")
self, self);
}
EOFLOGObjectFnStop();
return self;
}
@ -151,11 +151,11 @@ RCS_ID("$Id$")
- (void)setMasterClassDescription: (EOClassDescription *)classDescription
{
EOFLOGObjectFnStart();
ASSIGN(_masterClassDescriptionName, [classDescription entityName]);
EOFLOGObjectFnStop();
}
- (EOClassDescription *)classDescriptionForObjects
@ -178,12 +178,12 @@ RCS_ID("$Id$")
- (void)qualifyWithRelationshipKey: (NSString *)key
ofObject: masterObject
{
EOFLOGObjectFnStart();
ASSIGN(_detailKey, key);
ASSIGN(_masterObject, masterObject);
EOFLOGObjectFnStop();
}
- (NSString *)detailKey
@ -215,7 +215,7 @@ RCS_ID("$Id$")
{
id value=nil;
EOFLOGObjectFnStart();
if(!_masterObject)
value = [NSArray array];
@ -234,14 +234,14 @@ RCS_ID("$Id$")
value = [NSArray array];
}
EOFLOGObjectFnStop();
return value;
}
- (void)insertObject: (id)object
{
EOFLOGObjectFnStart();
if (!_masterObject)
[NSException raise: NSInternalInconsistencyException
@ -258,7 +258,7 @@ RCS_ID("$Id$")
[_masterObject addObject: object
toBothSidesOfRelationshipWithKey: _detailKey];
EOFLOGObjectFnStop();
}
- (void)deleteObject: (id)object

230
EOControl/EOEditingContext.m
View file

@ -493,7 +493,7 @@ _mergeValueForKey(id obj, id value,
int i;
IMP objectForGlobalIDIMP = NULL;
EOFLOGObjectFnStart();
for (i=0; i<4; i++)
{
@ -530,7 +530,7 @@ _mergeValueForKey(id obj, id value,
forKeys: keys
count: 4];
EOFLOGObjectFnStop();
return dict;
}
@ -578,9 +578,9 @@ _mergeValueForKey(id obj, id value,
NSDictionary *objectChangeInfo;
unsigned i,n;
EOFLOGObjectFnStart();
EOFLOGObjectLevelArgs(@"EOEditingContext", @"changes=%@", changes);
EOFLOGObjectLevelArgs(@"EOEditingContext", @"Unprocessed: %@",
[self unprocessedDescription]);
@ -665,7 +665,7 @@ _mergeValueForKey(id obj, id value,
object: self
userInfo: objectChangeInfo];
EOFLOGObjectFnStop();
}
- (NSArray *)_changesFromInvalidatingObjectsWithGlobalIDs: (NSArray *)globalIDs
@ -889,7 +889,7 @@ _mergeValueForKey(id obj, id value,
IMP enumNO=NULL; // nextObject
IMP userInfoOFK=NULL; // objectForKey:
EOFLOGObjectFnStart();
userInfo = [notification userInfo];
enumerator = [userInfo keyEnumerator];
@ -899,13 +899,13 @@ _mergeValueForKey(id obj, id value,
while ((tempGID = GDL2_NextObjectWithImpPtr(enumerator,&enumNO)))
{
EOFLOGObjectLevelArgs(@"EOEditingContext", @"tempGID=%@", tempGID);
gid = GDL2_ObjectForKeyWithImpPtr(userInfo,&userInfoOFK,tempGID);
EOFLOGObjectLevelArgs(@"EOEditingContext", @"gid=%@", gid);
object = NSMapGet(_objectsByGID, tempGID);
EOFLOGObjectLevelArgs(@"EOEditingContext", @"object=%@", object);
if (object)
{
@ -984,7 +984,7 @@ _mergeValueForKey(id obj, id value,
}
}
EOFLOGObjectFnStop();
}
- (void)_processNotificationQueue
@ -1084,7 +1084,7 @@ _mergeValueForKey(id obj, id value,
{
id object = nil;
EOFLOGObjectFnStart();
NSDebugMLLog(@"EOEditingContext", @"forgetObjectWithGlobalID: %@",
gid);
@ -1103,7 +1103,7 @@ _mergeValueForKey(id obj, id value,
}
}
EOFLOGObjectFnStop();
}
- (void) _invalidateObject: (id)object
@ -1112,7 +1112,7 @@ _mergeValueForKey(id obj, id value,
SEL sel = @selector(editingContext:shouldInvalidateObject:globalID:);
BOOL invalidate = YES;
EOFLOGObjectFnStart();
NSDebugMLLog(@"EOEditingContext", @"invalidateObject:withGlobalID: %@",
gid);
@ -1130,14 +1130,14 @@ _mergeValueForKey(id obj, id value,
editingContext: self];
}
EOFLOGObjectFnStop();
}
- (void) _invalidateObjectWithGlobalID: (EOGlobalID*)gid
{
id object = nil;
EOFLOGObjectFnStart();
NSDebugMLLog(@"EOEditingContext", @"invalidateObjectWithGlobalID: %@",
gid);
@ -1148,14 +1148,14 @@ _mergeValueForKey(id obj, id value,
[self _invalidateObject: object withGlobalID: gid];
}
EOFLOGObjectFnStop();
}
- (void) _invalidateObjectsWithGlobalIDs: (NSArray*)gids
{
unsigned count = 0;
EOFLOGObjectFnStart();
count=[gids count];
@ -1173,7 +1173,7 @@ _mergeValueForKey(id obj, id value,
}
};
EOFLOGObjectFnStop();
}
- (void) invalidateObjectsWithGlobalIDs: (NSArray*)gids
@ -1184,7 +1184,7 @@ _mergeValueForKey(id obj, id value,
int i;
int count = 0;
EOFLOGObjectFnStart();
[self processRecentChanges];
@ -1242,7 +1242,7 @@ _mergeValueForKey(id obj, id value,
/* ... and lockForReading again when apropriate. */
EOFLOGObjectFnStop();
}
- (void) _resetAllChanges: (NSDictionary *)dictionary
@ -1253,7 +1253,7 @@ _mergeValueForKey(id obj, id value,
- (void) _resetAllChanges
{
//TODO: Ayers Verify
EOFLOGObjectFnStart();
[self processRecentChanges];
@ -1265,12 +1265,12 @@ _mergeValueForKey(id obj, id value,
[self incrementUndoTransactionID];
EOFLOGObjectFnStop();
}
- (void)_enqueueEndOfEventNotification
{
EOFLOGObjectFnStart();
if (_flags.registeredForCallback == NO && _flags.processingChanges == NO)
{
@ -1302,19 +1302,19 @@ _mergeValueForKey(id obj, id value,
}
_flags.registeredForCallback = YES;
}
EOFLOGObjectFnStop();
}
- (NSArray *)objectsWithFetchSpecification: (EOFetchSpecification *)fetchSpecification
{
NSArray *objects;
EOFLOGObjectFnStart();
objects = [self objectsWithFetchSpecification: fetchSpecification
editingContext: self];
EOFLOGObjectFnStop();
return objects;
}
@ -1323,35 +1323,35 @@ _mergeValueForKey(id obj, id value,
{
EOGlobalID *gid;
EOFLOGObjectFnStart();
EOFLOGObjectLevelArgs(@"EOEditingContext", @"object=%@", object);
EOFLOGObjectLevelArgs(@"EOEditingContext", @"Unprocessed: %@",
[self unprocessedDescription]);
EOFLOGObjectLevelArgs(@"EOEditingContext", @"Objects: %@",
[self objectsDescription]);
gid = EOEditingContext_globalIDForObjectWithImpPtr(self,NULL,object);
EOFLOGObjectLevelArgs(@"EOEditingContext", @"gid=%@", gid);
//GSWDisplayGroup -insertAtIndex+EODataSource createObject call insert ! So object is inserted twice
if (_insertedObjects && NSHashGet(_insertedObjects, object))
{
// NSLog(@"Already inserted object [_insertedObjects] %p=%@",object,object);
// EOFLOGObjectLevelArgs(@"EOEditingContext",@"Already inserted object [_insertedObjects] %p=%@",object,object);
//
}
else if (_unprocessedInserts && NSHashGet(_unprocessedInserts, object))
{
// NSLog(@"Already inserted object [_unprocessedInserts] %p=%@",object,object);
// EOFLOGObjectLevelArgs(@"EOEditingContext",@"Already inserted object [_unprocessedInserts] %p=%@",object,object);
//
}
else
{
if (!gid)
{
gid = AUTORELEASE([EOTemporaryGlobalID new]);
EOFLOGObjectLevelArgs(@"EOEditingContext", @"gid=%@", gid);
}
EOFLOGObjectLevelArgs(@"EOEditingContext",
@ -1367,16 +1367,16 @@ _mergeValueForKey(id obj, id value,
EOFLOGObjectLevelArgs(@"EOEditingContext", @"Objects: %@",
[self objectsDescription]);
EOFLOGObjectFnStop();
}
- (void)insertObject: (id)object
withGlobalID: (EOGlobalID *)gid
{
EOFLOGObjectFnStart();
EOFLOGObjectLevelArgs(@"EOEditingContext", @"object=%@", object);
EOFLOGObjectLevelArgs(@"EOEditingContext", @"gid=%@", gid);
EOFLOGObjectLevelArgs(@"EOEditingContext", @"Unprocessed: %@",
[self unprocessedDescription]);
EOFLOGObjectLevelArgs(@"EOEditingContext", @"Objects: %@",
@ -1412,7 +1412,7 @@ _mergeValueForKey(id obj, id value,
EOFLOGObjectLevelArgs(@"EOEditingContext", @"Objects: %@",
[self objectsDescription]);
EOFLOGObjectFnStop();
}
- (void)_insertObject: (id)object
@ -1477,7 +1477,7 @@ _mergeValueForKey(id obj, id value,
- (void)_processEndOfEventNotification: (NSNotification*)notification
{
EOFLOGObjectFnStart();
EOFLOGObjectLevelArgs(@"EOEditingContext", @"Unprocessed: %@",
[self unprocessedDescription]);
@ -1497,12 +1497,12 @@ _mergeValueForKey(id obj, id value,
EOFLOGObjectLevelArgs(@"EOEditingContext", @"Objects: %@",
[self objectsDescription]);
EOFLOGObjectFnStop();
}
- (void)noop: (id)object
{
EOFLOGObjectFnStart();
/*
* This is just a dummy method which is only registered
* to achieve the side effect of registering a method
@ -1510,7 +1510,7 @@ _mergeValueForKey(id obj, id value,
* undo manager will register another method which will later
* post the NSUndoManagerCheckpointNotification.
*/
EOFLOGObjectFnStop();
}
//"Receive NSUndoManagerCheckpointNotification Notification
@ -1526,7 +1526,7 @@ _mergeValueForKey(id obj, id value,
{
BOOL result = YES;
EOFLOGObjectFnStart();
/* _assertSafeMultiThreadedAccess when/if necessary. */
@ -1819,7 +1819,7 @@ _mergeValueForKey(id obj, id value,
_flags.registeredForCallback = NO;
}
EOFLOGObjectFnStop();
return result;
}
@ -1827,7 +1827,7 @@ _mergeValueForKey(id obj, id value,
- (void) _processDeletedObjects
{
//OK finished ??
EOFLOGObjectFnStart();
EOFLOGObjectLevelArgs(@"EOEditingContext", @"Unprocessed: %@",
[self unprocessedDescription]);
@ -1855,7 +1855,7 @@ _mergeValueForKey(id obj, id value,
EOFLOGObjectLevelArgs(@"EOEditingContext", @"Objects: %@",
[self objectsDescription]);
EOFLOGObjectFnStop();
}
/*
@ -1937,7 +1937,7 @@ _mergeValueForKey(id obj, id value,
NSMutableArray *exceptions = nil;
BOOL validateForDelete = NO;
EOFLOGObjectFnStart();
EOFLOGObjectLevelArgs(@"EOEditingContext", @"unprocessed: %@",
[self unprocessedDescription]);
@ -2016,7 +2016,7 @@ _mergeValueForKey(id obj, id value,
}
}
EOFLOGObjectFnStop();
}
- (void) validateDeletesUsingTable: (NSHashTable*)deleteTable
@ -2043,7 +2043,7 @@ _mergeValueForKey(id obj, id value,
NSHashEnumerator enumerator;
id object = nil;
EOFLOGObjectFnStart();
EOFLOGObjectLevelArgs(@"EOEditingContext", @"table: %@",
NSStringFromHashTable(table));
@ -2083,7 +2083,7 @@ _mergeValueForKey(id obj, id value,
}
// NSEndHashTableEnumeration(enumerator);
EOFLOGObjectFnStop();
return ok;
}
@ -2108,14 +2108,14 @@ _mergeValueForKey(id obj, id value,
NSHashEnumerator enumerator;
id object = nil;
EOFLOGObjectFnStart();
enumerator = NSEnumerateHashTable(deleteTable);
while ((object = (id)NSNextHashEnumeratorItem(&enumerator)))
[object propagateDeleteWithEditingContext: self];
EOFLOGObjectFnStop();
}
- (void) _processOwnedObjectsUsingChangeTable: (NSHashTable*)changeTable
@ -2125,7 +2125,7 @@ _mergeValueForKey(id obj, id value,
NSHashEnumerator enumerator;
id object = nil;
EOFLOGObjectFnStart();
enumerator = NSEnumerateHashTable(changeTable);
@ -2137,7 +2137,7 @@ _mergeValueForKey(id obj, id value,
int i;
int count;
EOFLOGObjectLevelArgs(@"EOEditingContext", @"object:%@", object);
toOneRelationshipKeys = [object toOneRelationshipKeys];
EOFLOGObjectLevelArgs(@"EOEditingContext", @"toOneRelationshipKeys:%@",
@ -2154,7 +2154,7 @@ _mergeValueForKey(id obj, id value,
BOOL ownsDestinationObjects
= [object ownsDestinationObjectsForRelationshipKey:relKey];
EOFLOGObjectLevelArgs(@"EOEditingContext", @"relKey:%@", relKey);
EOFLOGObjectLevelArgs(@"EOEditingContext",
@"ownsDestinationObjects: %s",
(ownsDestinationObjects ? "YES" : "NO"));
@ -2175,7 +2175,7 @@ _mergeValueForKey(id obj, id value,
existingObject);
value = [object storedValueForKey: relKey];
EOFLOGObjectLevelArgs(@"EOEditingContext", @"value:%@", value);
if (value != existingObject)
{
@ -2212,7 +2212,7 @@ _mergeValueForKey(id obj, id value,
{
//We will insert it
NSHashInsertIfAbsent(objectsToInsert,value);
EOFLOGObjectLevelArgs(@"EOEditingContext",@"Will insert %@",value);
}
}
}
@ -2222,7 +2222,7 @@ _mergeValueForKey(id obj, id value,
toManyRelationshipKeys = [object toManyRelationshipKeys];
EOFLOGObjectLevelArgs(@"EOEditingContext", @"object:%@", object);
EOFLOGObjectLevelArgs(@"EOEditingContext", @"toManyRelationshipKeys: %@",
toManyRelationshipKeys);
@ -2236,7 +2236,7 @@ _mergeValueForKey(id obj, id value,
BOOL ownsDestinationObjects
= [object ownsDestinationObjectsForRelationshipKey: relKey];
EOFLOGObjectLevelArgs(@"EOEditingContext", @"relKey: %@", relKey);
EOFLOGObjectLevelArgs(@"EOEditingContext",
@"ownsDestinationObjects: %s",
(ownsDestinationObjects ? "YES" : "NO"));
@ -2302,7 +2302,7 @@ _mergeValueForKey(id obj, id value,
while ((object = (id)NSNextHashEnumeratorItem(&enumerator)))
{
EOFLOGObjectLevelArgs(@"EOEditingContext", @"Insert %@", object);
[self insertObject: object];
}
@ -2311,7 +2311,7 @@ _mergeValueForKey(id obj, id value,
//TODO-NOW: use deleteTable !
//[self notImplemented:_cmd]; //TODO
EOFLOGObjectFnStop();
}
- (void) registerUndoForModifiedObject: (id)object
@ -2320,12 +2320,12 @@ _mergeValueForKey(id obj, id value,
NSDictionary *snapshot;
NSDictionary *undoObject;
EOFLOGObjectFnStart();
EOFLOGObjectLevelArgs(@"EOEditingContext", @"object=%@", object);
gid = EOEditingContext_globalIDForObjectWithImpPtr(self,NULL,object);
EOFLOGObjectLevelArgs(@"EOEditingContext", @"gid=%@", gid);
snapshot = [self currentEventSnapshotForObject: object];
undoObject = [NSDictionary dictionaryWithObjectsAndKeys:
@ -2339,7 +2339,7 @@ _mergeValueForKey(id obj, id value,
[_eventSnapshotsByGID removeObjectForKey: gid];
EOFLOGObjectFnStop();
}
- (void) _undoUpdate: (id)param0
@ -2366,26 +2366,26 @@ _mergeValueForKey(id obj, id value,
//pas appellee dans le cas d'un delete ?
id object;
EOFLOGObjectFnStart();
object = [NSNumber numberWithUnsignedInt: _undoTransactionID];
_flags.registeredUndoTransactionID = YES;
EOFLOGObjectLevelArgs(@"EOEditingContext", @"_undoManager=%p", _undoManager);
EOFLOGObjectLevelArgs(@"EOEditingContext", @"_undoManager=%@", _undoManager);
EOFLOGObjectLevelArgs(@"EOEditingContext", @"self=%@", self);
EOFLOGObjectLevelArgs(@"EOEditingContext", @"object=%@", object);
[_undoManager registerUndoWithTarget: self
selector: @selector(_clearChangedThisTransaction:)
object: object];
EOFLOGObjectFnStop();
}
- (void)_clearChangedThisTransaction:(NSNumber *)transID
{
EOFLOGObjectFnStart();
if (_undoTransactionID == [transID unsignedShortValue])
{
static NSDictionary *info = nil;
@ -2410,14 +2410,14 @@ _mergeValueForKey(id obj, id value,
userInfo: info];
}
EOFLOGObjectFnStop();
}
- (void)deleteObject: (id)object
{
EOFLOGObjectFnStart();
EOFLOGObjectLevelArgs(@"EOEditingContext", @"object=%@", object);
EOFLOGObjectLevelArgs(@"EOEditingContext", @"Unprocessed: %@",
[self unprocessedDescription]);
EOFLOGObjectLevelArgs(@"EOEditingContext", @"Objects: %@",
@ -2462,7 +2462,7 @@ _mergeValueForKey(id obj, id value,
EOFLOGObjectLevelArgs(@"EOEditingContext", @"Objects: %@",
[self objectsDescription]);
EOFLOGObjectFnStop();
}
- (void)lockObject: (id)object
@ -2508,7 +2508,7 @@ _mergeValueForKey(id obj, id value,
int which;
IMP enumNO=NULL; // nextObject
EOFLOGObjectFnStart();
EOFLOGObjectLevelArgs(@"EOEditingContext",
@"Changes nb: inserted:%d deleted:%d changed:%d",
@ -2570,7 +2570,7 @@ _mergeValueForKey(id obj, id value,
objectsForNotification[2], EOUpdatedKey,
nil, nil]];
EOFLOGObjectFnStop();
}
- (void)saveChanges
@ -2578,7 +2578,7 @@ _mergeValueForKey(id obj, id value,
id object = nil;
NSEnumerator *enumerator;
EOFLOGObjectFnStart();
//TODOLOCK
[self lock];
@ -2664,11 +2664,11 @@ _mergeValueForKey(id obj, id value,
@"_objectStore saveChangesInEditingContext");
[_objectStore saveChangesInEditingContext: self];
EOFLOGObjectLevel(@"EOEditingContext", @"self didSaveChanges");
[self didSaveChanges];
EOFLOGObjectFnStop();
}
NS_HANDLER
{
@ -2692,7 +2692,7 @@ _mergeValueForKey(id obj, id value,
{
NSException *newException = nil;
EOFLOGObjectFnStartOrCond(@"EOEditingContext");
NS_DURING
{
@ -2710,7 +2710,7 @@ _mergeValueForKey(id obj, id value,
}
NS_ENDHANDLER;
EOFLOGObjectFnStopOrCond(@"EOEditingContext");
return newException;
}
@ -2746,7 +2746,7 @@ _mergeValueForKey(id obj, id value,
//Consider OK
EOGlobalID *gid = nil;
EOFLOGObjectFnStart();
gid = EOEditingContext_globalIDForObjectWithImpPtr(self,NULL,object);
@ -2755,14 +2755,14 @@ _mergeValueForKey(id obj, id value,
[_snapshotsByGID removeObjectForKey: gid];
}
EOFLOGObjectFnStop();
}
- (id)objectForGlobalID:(EOGlobalID *)globalID
{
id object = nil;
EOFLOGObjectFnStart();
EOFLOGObjectLevelArgs(@"EOEditingContext",
@"EditingContext: %p gid=%@",
@ -2778,7 +2778,7 @@ _mergeValueForKey(id obj, id value,
@"EditingContext: %p gid=%@ object=%p",
self, globalID, object);
EOFLOGObjectFnStop();
return object;
}
@ -2788,7 +2788,7 @@ _mergeValueForKey(id obj, id value,
//Consider OK
EOGlobalID *gid = nil;
EOFLOGObjectFnStart();
EOFLOGObjectLevelArgs(@"EOEditingContext",
@"ed context=%p _globalIDsByObject=%p object=%p",
@ -2800,9 +2800,9 @@ _mergeValueForKey(id obj, id value,
gid = [_sharedContext globalIDForObject: object];
}
EOFLOGObjectLevelArgs(@"EOEditingContext", @"gid=%@", gid);
EOFLOGObjectFnStop();
return gid;
}
@ -2871,9 +2871,9 @@ _mergeValueForKey(id obj, id value,
- (void)objectWillChange: (id)object
{
EOFLOGObjectFnStart();
// EOFLOGObjectLevelArgs(@"EOEditingContext", @"object=%@", object);
//
EOFLOGObjectLevelArgs(@"EOEditingContext",
@"object=%@ _flags.ignoreChangeNotification=%d",
object, (int)_flags.ignoreChangeNotification);
@ -2888,7 +2888,7 @@ _mergeValueForKey(id obj, id value,
snapshot = [object snapshot]; // OK
EOFLOGObjectLevelArgs(@"EOEditingContext", @"snapshot=%@", snapshot);
//if not in _unprocessedChanges: add in snaps and call _enqueueEndOfEventNotification
/*
[_undoManager registerUndoWithTarget:self
@ -2944,14 +2944,14 @@ _mergeValueForKey(id obj, id value,
}
}
EOFLOGObjectFnStop();
}
- (void)recordObject: (id)object
globalID: (EOGlobalID *)globalID
{
//OK
EOFLOGObjectFnStart();
EOFLOGObjectLevelArgs(@"EOEditingContext",
@"Record %p for %@ in ed context %p _globalIDsByObject=%p",
@ -2968,7 +2968,7 @@ _mergeValueForKey(id obj, id value,
// }
// NSHashInsert(ecDeallocHT, object);
EOFLOGObjectLevel(@"EOEditingContext", @"insertInto _globalIDsByObject");
NSMapInsert(_globalIDsByObject, object, globalID);
//TODO: Remove this test code
@ -2990,19 +2990,19 @@ _mergeValueForKey(id obj, id value,
NSMapInsert(_objectsByGID, globalID, object);
EOFLOGObjectLevel(@"EOEditingContext", @"addObserver");
[EOObserverCenter addObserver: self
forObject: object];
//call EOAccessFaultHandler targetClass
EOFLOGObjectFnStop();
}
- (void)forgetObject: (id)object
{
EOGlobalID *gid;
EOFLOGObjectFnStart();
/* Global hash table for faster dealloc. */
//NSHashRemove(ecDeallocHT, object);
@ -3021,7 +3021,7 @@ _mergeValueForKey(id obj, id value,
[EOObserverCenter removeObserver: self
forObject: object];
EOFLOGObjectFnStop();
}
- (NSArray *)registeredObjects
@ -3255,7 +3255,7 @@ It is updated after commiting new values.
EOGlobalID* gid=nil;
NSDictionary* snapshot=nil;
EOFLOGObjectFnStart();
gid=EOEditingContext_globalIDForObjectWithImpPtr(self,NULL,object);
snapshot=[_snapshotsByGID objectForKey: gid];
@ -3264,7 +3264,7 @@ It is updated after commiting new values.
@"object=%p snapshot %p=%@",
object,snapshot,snapshot);
EOFLOGObjectFnStop();
return snapshot;
}
@ -3426,13 +3426,13 @@ modified state of the object.**/
{
id object;
EOFLOGObjectFnStartOrCond(@"EOEditingContext");
object = [self faultForRawRow: row
entityNamed: entityName
editingContext: self];
EOFLOGObjectFnStopOrCond(@"EOEditingContext");
return object;
}
@ -3661,7 +3661,7 @@ modified state of the object.**/
//OK
NSArray *objects = nil;
EOFLOGObjectFnStart();
EOFLOGObjectLevelArgs(@"EOEditingContext",
@"_objectStore=%@ fetchSpecification=%@ context=%@",
@ -3696,7 +3696,7 @@ modified state of the object.**/
[self unlock]; //TODOLOCK
EOFLOGObjectFnStop();
return objects;
}
@ -3931,7 +3931,7 @@ static BOOL usesContextRelativeEncoding = NO;
{
NSString *desc;
EOFLOGObjectFnStart();
desc = [NSString stringWithFormat: @"<%p:\nunprocessedChanges [nb:%d]=%p %@\n\nunprocessedDeletes [nb:%d]=%p %@\n\nunprocessedInserts[nb:%d]=%p %@>\n",
self,
@ -3945,7 +3945,7 @@ static BOOL usesContextRelativeEncoding = NO;
_unprocessedInserts,
NSStringFromHashTable(_unprocessedInserts)];
EOFLOGObjectFnStop();
return desc;
}
@ -3954,7 +3954,7 @@ static BOOL usesContextRelativeEncoding = NO;
{
NSString *desc;
EOFLOGObjectFnStart();
desc = [NSString stringWithFormat: @"<%p:\nchangedObjects [nb:%d]=%p %@\n\ndeletedObjects [nb:%d]=%p %@\n\ninsertedObjects [nb:%d]=%p %@>\n",
self,
@ -3968,7 +3968,7 @@ static BOOL usesContextRelativeEncoding = NO;
_insertedObjects,
NSStringFromHashTable(_insertedObjects)];
EOFLOGObjectFnStop();
return desc;
}
@ -3988,7 +3988,7 @@ static BOOL usesContextRelativeEncoding = NO;
{
BOOL tryLock = NO;
EOFLOGObjectFnStart();
tryLock = [_lock tryLock];
@ -3997,29 +3997,29 @@ static BOOL usesContextRelativeEncoding = NO;
_lockCount++;
}
EOFLOGObjectFnStop();
return tryLock;
}
- (void)lock
{
EOFLOGObjectFnStart();
[_lock lock];
_lockCount++;
EOFLOGObjectFnStop();
}
- (void)unlock
{
EOFLOGObjectFnStart();
_lockCount--;
[_lock unlock];
EOFLOGObjectFnStop();
}
- (void) _assertSafeMultiThreadedAccess: (SEL)param0

12
EOControl/EOFaultHandler.m
View file

@ -182,18 +182,18 @@ RCS_ID("$Id$")
{ // TODO
NSMethodSignature *sig;
EOFLOGObjectFnStart();
NSDebugMLLog(@"gsdb", @"_targetClass=%p", _targetClass);
NSDebugMLLog(@"gsdb", @"_targetClass=%@", _targetClass);
NSDebugMLLog(@"gsdb", @"selector=%@", NSStringFromSelector(selector));
//TODO VERIFY
NSAssert(_targetClass, @"No target class");
sig = [_targetClass instanceMethodSignatureForSelector: selector];
NSDebugMLLog(@"gsdb",@"sig=%p", (void*)sig);
EOFLOGObjectFnStop();
return sig;
}

112
EOControl/EOGenericRecord.m
View file

@ -216,7 +216,7 @@ static const char _c_id[2] = { _C_ID, 0 };
{
BOOL ok;
EOFLOGObjectFnStartCond(@"EOGenericRecordKVC");
/* ok=[super _infoForInstanceVariableNamed:name
retType:type
retSize:size
@ -256,7 +256,7 @@ static const char _c_id[2] = { _C_ID, 0 };
}
}
EOFLOGObjectFnStopCond(@"EOGenericRecordKVC");
return ok;
}
@ -270,7 +270,7 @@ static const char _c_id[2] = { _C_ID, 0 };
{
id value = nil;
EOFLOGObjectFnStartCond(@"EOGenericRecordKVC");
EOFLOGObjectLevelArgs(@"EOGenericRecordKVC",
@"Super InstanceVar named %@: sel=%@ type=%s size=%u offset=%u",
aKey,NSStringFromSelector(sel),type,size,offset);
@ -289,7 +289,7 @@ static const char _c_id[2] = { _C_ID, 0 };
value, [value class]);
}
EOFLOGObjectFnStopCond(@"EOGenericRecordKVC");
return value;
}
@ -302,7 +302,7 @@ static const char _c_id[2] = { _C_ID, 0 };
size: (unsigned)size
offset: (int)offset
{
EOFLOGObjectFnStartCond(@"EOGenericRecordKVC");
EOFLOGObjectLevelArgs(@"EOGenericRecordKVC",
@"Super InstanceVar named %@: offset=%u",
aKey, offset);
@ -317,7 +317,7 @@ static const char _c_id[2] = { _C_ID, 0 };
else
GSObjCSetVal(self, [aKey UTF8String], anObject, sel, type, size, offset);
EOFLOGObjectFnStopCond(@"EOGenericRecordKVC");
}
//used to allow derived object implementation
@ -335,24 +335,24 @@ static const char _c_id[2] = { _C_ID, 0 };
- (void)takeStoredValue:(id)value
forKey:(NSString *)key
{
EOFLOGObjectFnStartOrCond(@"EOGenericRecord");
EOFLOGObjectLevelArgs(@"EOGenericRecord", @"key=%@", key);
[super takeStoredValue: value
forKey: key];
EOFLOGObjectFnStopOrCond(@"EOGenericRecord");
}
- (void)takeValue:(id)value
forKey:(NSString *)key
{
EOFLOGObjectFnStartOrCond(@"EOGenericRecord");
EOFLOGObjectLevelArgs(@"EOGenericRecord", @"key=%@", key);
[self willChange];
[super takeValue: value
forKey: key];
EOFLOGObjectFnStopOrCond(@"EOGenericRecord");
//
// if(value == nil || value == GDL2_EONull)
// [dictionary removeObjectForKey:key];
@ -372,30 +372,30 @@ static const char _c_id[2] = { _C_ID, 0 };
// [dictionary setObject:value forKey:key];
// }
//
// EOFLOGObjectFnStopOrCond(@"EOGenericRecord");
//
}
- (id)storedValueForKey:(NSString *)key
{
id value=nil;
EOFLOGObjectFnStartOrCond(@"EOGenericRecord");
EOFLOGObjectLevelArgs(@"EOGenericRecord",@"key=%@",key);
value=[super storedValueForKey: key];
EOFLOGObjectFnStopOrCond(@"EOGenericRecord");
return value;
}
- (id)valueForKey:(NSString *)key
{
id value=nil;
EOFLOGObjectFnStartOrCond(@"EOGenericRecord");
EOFLOGObjectLevelArgs(@"EOGenericRecord", @"key=%@", key);
value=[super valueForKey: key];
EOFLOGObjectFnStopOrCond(@"EOGenericRecord");
return value;
// id value=nil;
// EOFLOGObjectFnStartOrCond(@"EOGenericRecord");
// EOFLOGObjectLevelArgs(@"EOGenericRecord", @"key=%@", key);
//
//
// NSArray *attrKeys, *toManyKeys, *toOneKeys;
//
// attrKeys = [classDescription attributeKeys];
@ -408,7 +408,7 @@ static const char _c_id[2] = { _C_ID, 0 };
// return nil;
//
// value=[dictionary objectForKey:key];
// EOFLOGObjectFnStopOrCond(@"EOGenericRecord");
//
// return value;
}
*/
@ -433,8 +433,8 @@ inline BOOL infoForInstanceVariableWithImpPtr(id object,GDL2IMP_BOOL* impPtr,
id value = nil;
Class selfClass=[self class];
EOFLOGObjectFnStartCond(@"EOGenericRecordKVC");
EOFLOGObjectLevelArgs(@"EOGenericRecordKVC", @"aKey=%@", aKey);
if ([selfClass useStoredAccessor] == NO)
{
@ -571,8 +571,8 @@ inline BOOL infoForInstanceVariableWithImpPtr(id object,GDL2IMP_BOOL* impPtr,
};
}
EOFLOGObjectLevelArgs(@"EOGenericRecordKVC", @"value=%@", value);
EOFLOGObjectFnStopCond(@"EOGenericRecordKVC");
return value;
}
@ -586,13 +586,13 @@ inline BOOL infoForInstanceVariableWithImpPtr(id object,GDL2IMP_BOOL* impPtr,
int off = 0;
Class selfClass=[self class];
EOFLOGObjectFnStartCond(@"EOGenericRecordKVC");
EOFLOGObjectLevelArgs(@"EOGenericRecordKVC", @"anObject=%@", anObject);
EOFLOGObjectLevelArgs(@"EOGenericRecordKVC", @"aKey=%@", aKey);
if ([selfClass useStoredAccessor] == NO)
{
EOFLOGObjectLevelArgs(@"EOGenericRecordKVC", @"aKey=%@", aKey);
[self takeValue: anObject
forKey: aKey];
@ -714,7 +714,7 @@ inline BOOL infoForInstanceVariableWithImpPtr(id object,GDL2IMP_BOOL* impPtr,
}
};
EOFLOGObjectFnStopCond(@"EOGenericRecordKVC");
}
//#endif /* !FOUNDATION_HAS_KVC */
@ -724,7 +724,7 @@ inline BOOL infoForInstanceVariableWithImpPtr(id object,GDL2IMP_BOOL* impPtr,
{
BOOL isToMany = NO;
EOFLOGObjectFnStartCond(@"EOGenericRecordKVC");
isToMany=[[classDescription toManyRelationshipKeys]
containsObject: aKey];
@ -758,7 +758,7 @@ inline BOOL infoForInstanceVariableWithImpPtr(id object,GDL2IMP_BOOL* impPtr,
[self takeValue: anObject
forKey: aKey];
EOFLOGObjectFnStopCond(@"EOGenericRecordKVC");
}
//MG#if !FOUNDATION_HAS_KVC
@ -769,9 +769,9 @@ inline BOOL infoForInstanceVariableWithImpPtr(id object,GDL2IMP_BOOL* impPtr,
unsigned size;
int off=0;
EOFLOGObjectFnStartCond(@"EOGenericRecordKVC");
EOFLOGObjectLevelArgs(@"EOGenericRecordKVC", @"anObject=%@", anObject);
EOFLOGObjectLevelArgs(@"EOGenericRecordKVC", @"aKey=%@", aKey);
size = [aKey length];
if (size < 1)
@ -889,7 +889,7 @@ inline BOOL infoForInstanceVariableWithImpPtr(id object,GDL2IMP_BOOL* impPtr,
offset: off];
};
EOFLOGObjectFnStopCond(@"EOGenericRecordKVC");
}
- (id) valueForKey: (NSString*)aKey
@ -900,8 +900,8 @@ inline BOOL infoForInstanceVariableWithImpPtr(id object,GDL2IMP_BOOL* impPtr,
int off = 0;
id value = nil;
EOFLOGObjectFnStartCond(@"EOGenericRecordKVC");
EOFLOGObjectLevelArgs(@"EOGenericRecordKVC", @"aKey=%@", aKey);
size = [aKey length];
if (size < 1)
@ -1023,7 +1023,7 @@ inline BOOL infoForInstanceVariableWithImpPtr(id object,GDL2IMP_BOOL* impPtr,
};
EOFLOGObjectLevelArgs(@"EOGenericRecordKVC", @"value: %p (class=%@)",
value, [value class]);
EOFLOGObjectFnStopCond(@"EOGenericRecordKVC");
return value;
}
@ -1034,7 +1034,7 @@ inline BOOL infoForInstanceVariableWithImpPtr(id object,GDL2IMP_BOOL* impPtr,
{
id value;
EOFLOGObjectFnStartCond(@"EOGenericRecordKVC");
EOFLOGObjectLevelArgs(@"EOGenericRecordKVC",
@"Unbound key named %@",
key);
@ -1046,14 +1046,14 @@ inline BOOL infoForInstanceVariableWithImpPtr(id object,GDL2IMP_BOOL* impPtr,
EOFLOGObjectLevelArgs(@"EOGenericRecordKVC", @"value %p (class=%@)",
value, [value class]);
EOFLOGObjectFnStopCond(@"EOGenericRecordKVC");
return value;
}
- (void) handleTakeValue: (id)value forUnboundKey: (NSString *)key
{
EOFLOGObjectFnStartCond(@"EOGenericRecordKVC");
EOFLOGObjectLevelArgs(@"EOGenericRecordKVC",
@"Unbound key named %@",
key);
@ -1071,7 +1071,7 @@ inline BOOL infoForInstanceVariableWithImpPtr(id object,GDL2IMP_BOOL* impPtr,
// forKey: key];
[dictionary removeObjectForKey: key];
EOFLOGObjectFnStopCond(@"EOGenericRecordKVC");
}
*/
//MG#endif /* FOUNDATION_HAS_KVC */
@ -1239,7 +1239,7 @@ You can override this to exclude properties manually handled by derived object *
NSHashEnumerator hashEnum;
NSAutoreleasePool *arp;
EOFLOGClassFnStart();
//NSDebugMLog(@"CALCULATE START");
[allGenericRecordsLock lock];
@ -1280,7 +1280,7 @@ You can override this to exclude properties manually handled by derived object *
[allGenericRecordsLock unlock];
//NSDebugMLog(@"CALCULATE STOP");
EOFLOGClassFnStop();
}
- (unsigned int)eoCalculateSizeWith: (NSMutableDictionary *)dict
@ -1288,7 +1288,7 @@ You can override this to exclude properties manually handled by derived object *
NSMutableDictionary *processed;
NSValue *selfP;
EOFLOGObjectFnStartOrCond(@"EOGenericRecord");
//NSDebugMLog(@"CALCULATE OBJ START %p", self);
processed = [dict objectForKey: @"processed"];
@ -1411,7 +1411,7 @@ You can override this to exclude properties manually handled by derived object *
}
//NSDebugMLog(@"CALCULATE OBJ STOP %p", self);
EOFLOGObjectFnStopOrCond(@"EOGenericRecord");
return 0;
}
@ -1422,7 +1422,7 @@ You can override this to exclude properties manually handled by derived object *
NSMutableDictionary *processed;
NSValue *selfP;
EOFLOGObjectFnStartOrCond(@"EOGenericRecord");
//NSDebugMLog(@"CALCULATE ARRAY START %p", self);
processed = [dict objectForKey: @"processed"];
@ -1457,7 +1457,7 @@ You can override this to exclude properties manually handled by derived object *
}
//NSDebugMLog(@"CALCULATE ARRAY START %p", self);
EOFLOGClassFnStop();
return [array eoGetSize]; //return the base size
}
@ -1473,7 +1473,7 @@ You can override this to exclude properties manually handled by derived object *
unsigned totalNb = 0;
NSEnumerator *enumK;
EOFLOGClassFnStart();
processed = [dict objectForKey: @"processed"];
summaryNb = [dict objectForKey: @"summaryNb"];
@ -1505,7 +1505,7 @@ You can override this to exclude properties manually handled by derived object *
(int)(totalNb!=0 ? (totalSize / totalNb) : 0),
(int)(totalNb!=0 ? (totalSize / totalNb / 1024) : 0)];
EOFLOGClassFnStop();
return dscr;
}
@ -1567,12 +1567,12 @@ You can override this to exclude properties manually handled by derived object *
- (unsigned int)eoCalculateSizeWith: (NSMutableDictionary *)dict
{
//EOFLOGObjectFnStartOrCond(@"EOGenericRecord");
//
return [EOGenericRecord eoCalculateSizeWith: dict
forArray: [self allValues]];
//EOFLOGObjectFnStopOrCond(@"EOGenericRecord");
//
}
@end
@ -1586,7 +1586,7 @@ You can override this to exclude properties manually handled by derived object *
unsigned int baseSize = 0;
NSValue *objectP;
EOFLOGClassFnStart();
//NSDebugFLog(@"CALCULATE FAULT START %p",object);
processed = [dict objectForKey: @"processed"];
@ -1664,7 +1664,7 @@ You can override this to exclude properties manually handled by derived object *
}
//NSDebugMLog(@"CALCULATE FAULT STOP %p", object);
EOFLOGClassFnStop();
return baseSize;
}

8
EOControl/EOGlobalID.m
View file

@ -121,7 +121,7 @@ static unsigned short sequence = USHRT_MAX;
unsigned int i;
union { NSTimeInterval interval; unsigned long stamp; } time;
EOFLOGObjectFnStart();
if (pid == 0)
{
@ -186,19 +186,19 @@ static unsigned short sequence = USHRT_MAX;
sequence = USHRT_MAX;
}
EOFLOGObjectFnStop();
}
- (id)init
{
EOFLOGObjectFnStart();
if ((self = [super init]))
{
[EOTemporaryGlobalID assignGloballyUniqueBytes:_bytes];
}
EOFLOGObjectFnStop();
return self;
}

4
EOControl/EOKeyComparisonQualifier.m
View file

@ -274,7 +274,7 @@ RCS_ID("$Id$")
- (id) initWithKeyValueUnarchiver: (EOKeyValueUnarchiver*)unarchiver
{
EOFLOGObjectFnStartOrCond(@"EOQualifier");
if ((self = [self init]))
{
@ -287,7 +287,7 @@ RCS_ID("$Id$")
ASSIGN(_rightKey, [unarchiver decodeObjectForKey: @"rightKey"]);
}
EOFLOGObjectFnStopOrCond(@"EOQualifier");
return self;
}

106
EOControl/EOKeyValueArchiver.m
View file

@ -193,8 +193,8 @@ RCS_ID("$Id$")
/** Returns archived object/tree as propertList **/
- (NSDictionary*) dictionary
{
EOFLOGObjectFnStartOrCond(@"EOKeyValueArchiver");
EOFLOGObjectFnStopOrCond(@"EOKeyValueArchiver");
return _propertyList;
}
@ -202,43 +202,43 @@ RCS_ID("$Id$")
- (void) encodeInt: (int)intValue
forKey: (NSString*)key
{
EOFLOGObjectFnStartOrCond(@"EOKeyValueArchiver");
NSDebugMLLog(@"gsdb", @"key=%@ intValue=%d",key,intValue);
NSAssert(key,@"No key");
[_propertyList setObject: [NSNumber numberWithInt: intValue]
forKey: key];
NSDebugMLLog(@"gsdb", @"_propertyList=%@",_propertyList);
EOFLOGObjectFnStopOrCond(@"EOKeyValueArchiver");
}
/** Archives boolean 'yn' as 'key' **/
- (void) encodeBool: (BOOL)yn
forKey: (NSString*)key
{
EOFLOGObjectFnStartOrCond(@"EOKeyValueArchiver");
NSDebugMLLog(@"gsdb", @"key=%@ yn=%s",key,(yn ? "YES" : "NO"));
NSAssert(key,@"No key");
[_propertyList setObject: [NSNumber numberWithBool: yn]
forKey: key];
NSDebugMLLog(@"gsdb", @"_propertyList=%@",_propertyList);
EOFLOGObjectFnStopOrCond(@"EOKeyValueArchiver");
}
/** Archives a dictionary for 'key' **/
- (void) _encodeDictionary: (NSDictionary*)dictionary
forKey: (NSString*)key
{
EOFLOGObjectFnStartOrCond(@"EOKeyValueArchiver");
NSDebugMLLog(@"gsdb", @"key=%@ dictionary=%@",key,dictionary);
NSAssert(key,@"No key");
if ([dictionary count]>0)
@ -249,7 +249,7 @@ RCS_ID("$Id$")
// Save current propertyList
currentPropertyList=AUTORELEASE(_propertyList);
NSDebugMLLog(@"gsdb", @"currentPropertyList=%@",currentPropertyList);
// Set new empty propertyList to encode each object
_propertyList=[NSMutableDictionary new];
@ -277,7 +277,7 @@ RCS_ID("$Id$")
forKey:key];
};
EOFLOGObjectFnStopOrCond(@"EOKeyValueArchiver");
}
/** Archives an array objects for 'key' **/
@ -286,9 +286,9 @@ RCS_ID("$Id$")
{
unsigned int count=0;
EOFLOGObjectFnStartOrCond(@"EOKeyValueArchiver");
NSDebugMLLog(@"gsdb", @"key=%@ objects=%@",key,objects);
NSAssert(key,@"No key");
count=[objects count];
@ -300,7 +300,7 @@ RCS_ID("$Id$")
// Save current propertyList
currentPropertyList=AUTORELEASE(_propertyList);
NSDebugMLLog(@"gsdb", @"currentPropertyList=%@",currentPropertyList);
// Set new empty propertyList to encode each object
_propertyList=[NSMutableDictionary new];
@ -314,7 +314,7 @@ RCS_ID("$Id$")
forKey:@"voidKey"];
encodedObject=[_propertyList objectForKey:@"voidKey"];
NSDebugMLLog(@"gsdb", @"object=%@ encodedObject=%@",object,encodedObject);
NSAssert1(encodedObject,@"No encodedObject for %@",object);
[archiveArray addObject:encodedObject];
@ -336,7 +336,7 @@ RCS_ID("$Id$")
forKey:key];
};
EOFLOGObjectFnStopOrCond(@"EOKeyValueArchiver");
}
- (void) _encodeValue: (id)value
@ -354,9 +354,9 @@ its delegate method -archiver:referenceToEncodeForObject:
- (void) encodeReferenceToObject: (id)object
forKey: (NSString*)key
{
EOFLOGObjectFnStartOrCond(@"EOKeyValueArchiver");
NSDebugMLLog(@"gsdb", @"key=%@ object=%@",key,object);
NSAssert(key,@"No key");
// object is nil ?
@ -373,7 +373,7 @@ its delegate method -archiver:referenceToEncodeForObject:
referenceToEncodeForObject:object];
NSDebugMLLog(@"gsdb", @"key=%@ object (reference)=%@",key,object);
//TODO
// What should we do when delegate returns no reference ?
@ -383,9 +383,9 @@ its delegate method -archiver:referenceToEncodeForObject:
forKey:key];
};
NSDebugMLLog(@"gsdb", @"_propertyList=%@",_propertyList);
EOFLOGObjectFnStopOrCond(@"EOKeyValueArchiver");
}
/** Archives the object 'object' as 'key'.
@ -395,9 +395,9 @@ EOKeyValueArchiving protocol. Raise an exception otherwise.
- (void) encodeObject: (id)object
forKey: (NSString*)key
{
EOFLOGObjectFnStartOrCond(@"EOKeyValueArchiver");
NSDebugMLLog(@"gsdb", @"key=%@ object=%@",key,object);
NSAssert(key,@"No key");
// object is nil ?
@ -436,7 +436,7 @@ EOKeyValueArchiving protocol. Raise an exception otherwise.
// Save current propertyList
NSMutableDictionary* currentPropertyList=nil;
currentPropertyList=AUTORELEASE(_propertyList);
NSDebugMLLog(@"gsdb", @"currentPropertyList=%@",currentPropertyList);
// Set new empty one as current one
_propertyList=[NSMutableDictionary new];
@ -448,7 +448,7 @@ EOKeyValueArchiving protocol. Raise an exception otherwise.
// Encode object
[object encodeWithKeyValueArchiver:self];
NSDebugMLLog(@"gsdb", @"object propertyList=%@",_propertyList);
// add object propertyList into current propertyList
// for the key
@ -466,9 +466,9 @@ EOKeyValueArchiving protocol. Raise an exception otherwise.
};
NSDebugMLLog(@"gsdb", @"_propertyList=%@",_propertyList);
EOFLOGObjectFnStopOrCond(@"EOKeyValueArchiver");
}
/** Returns receiver's delegate **/
@ -480,11 +480,11 @@ EOKeyValueArchiving protocol. Raise an exception otherwise.
/** Set receiver's delegate **/
- (void) setDelegate: (id)delegate
{
EOFLOGObjectFnStartOrCond(@"EOKeyValueArchiver");
_delegate=delegate;
EOFLOGObjectFnStopOrCond(@"EOKeyValueArchiver");
}
@end
@ -537,7 +537,7 @@ on all unarchived objects **/
container = [_allUnarchivedObjects objectAtIndex: i];
object = [container object];
NSDebugMLLog(@"gsdb", @"finishInitializationWithKeyValueUnarchiver index:%d", i);
[object finishInitializationWithKeyValueUnarchiver: self];
}
@ -570,7 +570,7 @@ on all unarchived objects **/
EOKeyValueArchivingContainer *container;
id object;
NSDebugMLLog(@"gsdb", @"awakeObject index:%d", i);
container = [_allUnarchivedObjects objectAtIndex: i];
object = [container object];
@ -587,7 +587,7 @@ on all unarchived objects **/
{
if (!NSHashInsertIfAbsent(_awakenedObjects, object))
{
NSDebugMLLog(@"gsdb", @"ensureObjectAwake:%@", object);
[object awakeFromKeyValueUnarchiver: self];
}
@ -600,7 +600,7 @@ on all unarchived objects **/
{
id object = nil;
NSDebugMLLog(@"gsdb", @"decodeIntForKey:%@", key);
object = [_propertyList objectForKey: key];
@ -613,7 +613,7 @@ NO if no object is found **/
{
id object=nil;
NSDebugMLLog(@"gsdb", @"decodeBoolForKey:%@", key);
object = [_propertyList objectForKey: key];
@ -628,7 +628,7 @@ its delegate method -unarchiver:objectForReference: **/
id objectReference = nil;
id object;
NSDebugMLLog(@"gsdb", @"decodeObjectReferenceForKey:%@", key);
object = [self decodeObjectForKey: key];
@ -649,17 +649,17 @@ class instances should implements -initWithKeyValueUnarchiver: **/
id propListObject;
id obj = nil;
NSDebugMLLog(@"gsdb", @"decodeObjectForKey:%@", key);
propListObject = [_propertyList objectForKey: key];
NSDebugMLLog(@"gsdb", @"key: %@ propListObject:%@", key, propListObject);
if (propListObject)
{
obj = [self _findTypeForPropertyListDecoding: propListObject];
}
NSDebugMLLog(@"gsdb", @"key: %@ obj:%@", key, obj);
return obj;
}
@ -674,7 +674,7 @@ class instances should implements -initWithKeyValueUnarchiver: **/
{
id retVal = nil;
NSDebugMLLog(@"gsdb", @"obj:%@", obj);
if ([obj isKindOfClass: GDL2_NSDictionaryClass])
{
@ -688,7 +688,7 @@ class instances should implements -initWithKeyValueUnarchiver: **/
if (!retVal)
{
//TODO
NSDebugMLLog(@"gsdb", @"ERROR: No retVal for Obj:%@", obj);
}
}
else if ([obj isKindOfClass: GDL2_NSArrayClass])
@ -696,7 +696,7 @@ class instances should implements -initWithKeyValueUnarchiver: **/
else
retVal=obj;
NSDebugMLLog(@"gsdb", @"retVal:%@", retVal);
return retVal;
}
@ -712,17 +712,17 @@ class instances should implements -initWithKeyValueUnarchiver: **/
id object;
id retObject;
NSDebugMLLog(@"gsdb", @"key:%@", key);
object = [propList objectForKey: key];
NSDebugMLLog(@"gsdb", @"Object:%@", object);
retObject = [self _findTypeForPropertyListDecoding: object];
NSDebugMLLog(@"gsdb", @"retObject:%@", retObject);
if (!retObject)
{
NSDebugMLLog(@"gsdb", @"ERROR: No retObject for Object:%@", object);
//TODO
}
else
@ -740,7 +740,7 @@ class instances should implements -initWithKeyValueUnarchiver: **/
NSEnumerator *propListEnum;
id propListObject;
EOFLOGObjectFnStartOrCond(@"EOKeyValueUnarchiver");
if (propList && (propListEnum = [propList objectEnumerator]))
{
@ -755,7 +755,7 @@ class instances should implements -initWithKeyValueUnarchiver: **/
}
}
EOFLOGObjectFnStopOrCond(@"EOKeyValueUnarchiver");
return newObjects;
}
@ -770,7 +770,7 @@ class instances should implements -initWithKeyValueUnarchiver: **/
_propertyList = RETAIN(propList); //Because dealloc may try to release it
NSDebugMLLog(@"gsdb", @"propList:%@", propList);
NS_DURING
{
@ -809,8 +809,8 @@ class instances should implements -initWithKeyValueUnarchiver: **/
AUTORELEASE(propList);
NSDebugMLLog(@"gsdb", @"propList:%@", propList);
NSDebugMLLog(@"gsdb", @"object:%@", object);
return object;
}

100
EOControl/EOKeyValueCoding.m
View file

@ -353,7 +353,7 @@ initialize(void)
NSRange r;
id result;
EOFLOGObjectFnStartCond(@"EOKVC");
if ([keyPath hasPrefix: @"@"] || (r = [keyPath rangeOfString: @"."]).location == NSNotFound)
{
@ -367,7 +367,7 @@ initialize(void)
result = [[self valueForKey: key] valueForKeyPath: path];
}
EOFLOGObjectFnStopCond(@"EOKVC");
return result;
}
@ -426,7 +426,7 @@ initialize(void)
INITIALIZE;
EOFLOGObjectFnStartCond(@"EOKVC");
mode = [[NSDecimalNumber defaultBehavior] roundingMode];
count = [self count];
@ -461,7 +461,7 @@ initialize(void)
NSDecimalDivide(&result, &left, &right, mode);
ret = [NSDecimalNumber decimalNumberWithDecimal: result];
EOFLOGObjectFnStopCond(@"EOKVC");
return ret;
}
@ -470,11 +470,11 @@ initialize(void)
NSArray *array;
id result;
EOFLOGObjectFnStartCond(@"EOKVC");
array = key ? [self valueForKeyPath: key] : self;
result = [NSDecimalNumber numberWithUnsignedInt: [array count]];
EOFLOGObjectFnStopCond(@"EOKVC");
return result;
}
@ -486,7 +486,7 @@ initialize(void)
INITIALIZE;
EOFLOGObjectFnStartCond(@"EOKVC");
count = [self count];
if (count > 0)
@ -517,7 +517,7 @@ initialize(void)
}
}
EOFLOGObjectFnStopCond(@"EOKVC");
return result;
}
@ -529,7 +529,7 @@ initialize(void)
INITIALIZE;
EOFLOGObjectFnStartCond(@"EOKVC");
count = [self count];
if (count > 0)
@ -559,7 +559,7 @@ initialize(void)
}
}
EOFLOGObjectFnStopCond(@"EOKVC");
return result;
}
@ -598,7 +598,7 @@ initialize(void)
{
id value;
EOFLOGObjectFnStartCond(@"EOKVC");
//EOFLOGObjectLevelArgs(@"EOKVC", @"key=%@",
// key);
@ -646,7 +646,7 @@ initialize(void)
//EOFLOGObjectLevelArgs(@"EOKVC", @"key=%@ value: %p (class=%@)",
// key, value, [value class]);
EOFLOGObjectFnStopCond(@"EOKVC");
return value;
}
@ -664,7 +664,7 @@ initialize(void)
{
id value;
EOFLOGObjectFnStartCond(@"EOKVC");
//EOFLOGObjectLevelArgs(@"EOKVC", @"key=%@",
// key);
@ -688,7 +688,7 @@ initialize(void)
//EOFLOGObjectLevelArgs(@"EOKVC", @"key=%@ value: %p (class=%@)",
// key, value, [value class]);
EOFLOGObjectFnStopCond(@"EOKVC");
return value;
}
@ -705,7 +705,7 @@ initialize(void)
INITIALIZE;
EOFLOGObjectFnStartCond(@"EOKVC");
//EOFLOGObjectLevelArgs(@"EOKVC", @"keyPath=\"%@\"",
// keyPath);
@ -716,16 +716,16 @@ initialize(void)
mutableCopy] autorelease];
NSMutableString *key = [NSMutableString string];
//EOFLOGObjectLevelArgs(@"EOKVC", @"keyPathArray=%@", keyPathArray);
//
while ([keyPathArray count] > 0)
{
id tmpKey;
//EOFLOGObjectLevelArgs(@"EOKVC", @"keyPathArray=%@", keyPathArray);
//
tmpKey = [keyPathArray objectAtIndex: 0];
//EOFLOGObjectLevelArgs(@"EOKVC", @"tmpKey=%@", tmpKey);
//
[keyPathArray removeObjectAtIndex: 0];
@ -740,10 +740,10 @@ initialize(void)
else
[key appendString: tmpKey];
//EOFLOGObjectLevelArgs(@"EOKVC", @"key=%@", key);
//
}
//EOFLOGObjectLevelArgs(@"EOKVC", @"key=%@", key);
//
value = [self valueForKey: key];
@ -778,7 +778,7 @@ initialize(void)
//EOFLOGObjectLevelArgs(@"EOKVC",@"keyPath=%@ value: %p (class=%@)",
// keyPath,value,[value class]);
EOFLOGObjectFnStopCond(@"EOKVC");
return value;
}
@ -795,7 +795,7 @@ initialize(void)
INITIALIZE;
EOFLOGObjectFnStartCond(@"EOKVC");
//EOFLOGObjectLevelArgs(@"EOKVC",@"keyPath=\"%@\"",
// keyPath);
@ -806,16 +806,16 @@ initialize(void)
mutableCopy] autorelease];
NSMutableString *key = [NSMutableString string];
//EOFLOGObjectLevelArgs(@"EOKVC", @"keyPathArray=%@", keyPathArray);
//
while ([keyPathArray count] > 0)
{
id tmpKey;
//EOFLOGObjectLevelArgs(@"EOKVC", @"keyPathArray=%@", keyPathArray);
//
tmpKey = [keyPathArray objectAtIndex: 0];
//EOFLOGObjectLevelArgs(@"EOKVC", @"tmpKey=%@", tmpKey);
//
[keyPathArray removeObjectAtIndex: 0];
@ -830,10 +830,10 @@ initialize(void)
else
[key appendString: tmpKey];
//EOFLOGObjectLevelArgs(@"EOKVC", @"key=%@", key);
//
}
//EOFLOGObjectLevelArgs(@"EOKVC", @"key=%@", key);
//
value = [self storedValueForKey: key];
@ -868,7 +868,7 @@ initialize(void)
//EOFLOGObjectLevelArgs(@"EOKVC",@"keyPath=%@ value: %p (class=%@)",
// keyPath,value,[value class]);
EOFLOGObjectFnStopCond(@"EOKVC");
return value;
}
@ -938,7 +938,7 @@ initialize(void)
forKeyPath: (NSString *)keyPath
isSmart: (BOOL)smartFlag
{
EOFLOGObjectFnStartCond(@"EOKVC");
//EOFLOGObjectLevelArgs(@"EOKVC", @"keyPath=\"%@\"",
// keyPath);
@ -953,16 +953,16 @@ initialize(void)
unsigned keyPathArrayCount = [keyPathArray count];
//EOFLOGObjectLevelArgs(@"EOKVC", @"keyPathArray=%@", keyPathArray);
//
while (keyPathArrayCount > 0)
{
id tmpKey;
//EOFLOGObjectLevelArgs(@"EOKVC", @"keyPathArray=%@", keyPathArray);
//
tmpKey = RETAIN([keyPathArray objectAtIndex: 0]);
//EOFLOGObjectLevelArgs(@"EOKVC", @"tmpKey=%@", tmpKey);
//
[keyPathArray removeObjectAtIndex: 0];
keyPathArrayCount--;
@ -980,10 +980,10 @@ initialize(void)
RELEASE(tmpKey);
//EOFLOGObjectLevelArgs(@"EOKVC", @"key=%@", key);
//
}
//EOFLOGObjectLevelArgs(@"EOKVC",@"key=%@",key);
//
//EOFLOGObjectLevelArgs(@"EOKVC",@"left keyPathArray=\"%@\"",
// keyPathArray);
@ -1028,7 +1028,7 @@ initialize(void)
}
}
EOFLOGObjectFnStopCond(@"EOKVC");
}
/**
@ -1041,7 +1041,7 @@ initialize(void)
- (void)takeStoredValue: (id)value
forKeyPath: (NSString *)keyPath
{
EOFLOGObjectFnStartCond(@"EOKVC");
//EOFLOGObjectLevelArgs(@"EOKVC",@"keyPath=\"%@\"",
// keyPath);
@ -1054,16 +1054,16 @@ initialize(void)
int keyPathArrayCount=[keyPathArray count];
//EOFLOGObjectLevelArgs(@"EOKVC", @"keyPathArray=%@", keyPathArray);
//
while (keyPathArrayCount > 0)
{
id tmpKey;
//EOFLOGObjectLevelArgs(@"EOKVC", @"keyPathArray=%@", keyPathArray);
//
tmpKey = [keyPathArray objectAtIndex: 0];
//EOFLOGObjectLevelArgs(@"EOKVC", @"tmpKey=%@", tmpKey);
//
[keyPathArray removeObjectAtIndex: 0];
keyPathArrayCount--;
@ -1080,10 +1080,10 @@ initialize(void)
else
[key appendString: tmpKey];
//EOFLOGObjectLevelArgs(@"EOKVC", @"key=%@", key);
//
}
//EOFLOGObjectLevelArgs(@"EOKVC", @"key=%@", key);
//
//EOFLOGObjectLevelArgs(@"EOKVC",@"left keyPathArray=\"%@\"",
// keyPathArray);
@ -1121,7 +1121,7 @@ initialize(void)
[self removeObjectForKey: keyPath];
}
EOFLOGObjectFnStopCond(@"EOKVC");
}
@end
@ -1146,7 +1146,7 @@ initialize(void)
INITIALIZE;
EOFLOGObjectFnStartCond(@"EOKVC");
n = [keyPaths count];
newKeyPaths = AUTORELEASE([[NSMutableArray alloc] initWithCapacity: n]);
@ -1183,7 +1183,7 @@ initialize(void)
values = [NSDictionary dictionaryWithObjects: newVals
forKeys: newKeyPaths];
EOFLOGObjectFnStopCond(@"EOKVC");
return values;
}
@ -1202,7 +1202,7 @@ initialize(void)
id obj = self;
int i, count;
EOFLOGObjectFnStartCond(@"EOKVC");
pathArray = [key componentsSeparatedByString:@"."];
count = [pathArray count];
@ -1216,7 +1216,7 @@ initialize(void)
path = [pathArray lastObject];
[obj takeStoredValue: value forKey: path];
EOFLOGObjectFnStopCond(@"EOKVC");
}
/**
@ -1231,7 +1231,7 @@ initialize(void)
NSString *path;
id obj = self;
int i, count;
EOFLOGObjectFnStartCond(@"EOKVC");
pathArray = [key componentsSeparatedByString:@"."];
count = [pathArray count];
@ -1243,7 +1243,7 @@ initialize(void)
path = [pathArray lastObject];
obj=[obj storedValueForKey:path];
EOFLOGObjectFnStopCond(@"EOKVC");
return obj;
}
@ -1264,7 +1264,7 @@ initialize(void)
INITIALIZE;
EOFLOGObjectFnStartCond(@"EOKVC");
n = [keyPaths count];
@ -1299,7 +1299,7 @@ initialize(void)
values = [NSDictionary dictionaryWithObjects: newVals
forKeys: newKeyPaths];
EOFLOGObjectFnStopCond(@"EOKVC");
return values;
}

6
EOControl/EOKeyValueQualifier.m
View file

@ -355,7 +355,7 @@ RCS_ID("$Id$")
{
EOQualifier* qualifier=nil;
EOFLOGObjectLevelArgs(@"EOQualifier", @"bindings=%@", bindings);
if ([_value isKindOfClass:[EOQualifierVariable class]])
{
@ -406,7 +406,7 @@ RCS_ID("$Id$")
- (id) initWithKeyValueUnarchiver: (EOKeyValueUnarchiver*)unarchiver
{
EOFLOGObjectFnStartOrCond(@"EOQualifier");
if ((self = [self init]))
{
@ -419,7 +419,7 @@ RCS_ID("$Id$")
ASSIGN(_value, [unarchiver decodeObjectForKey: @"value"]);
}
EOFLOGObjectFnStopOrCond(@"EOQualifier");
return self;
}

62
EOControl/EOMutableKnownKeyDictionary.m
View file

@ -106,7 +106,7 @@ RCS_ID("$Id$")
[self zone]);
_keys = NSZoneMalloc([self zone], count * sizeof(NSString*));
EOFLOGObjectLevelArgs(@"EOMKKD", @"keys=%p _keys=%p", keys, _keys);
for (i = 0; i < count; i++)
{
@ -115,7 +115,7 @@ RCS_ID("$Id$")
_count = i + 1;
EOFLOGObjectLevelArgs(@"EOMKKD", @"key=%p", key);
EOFLOGObjectLevelArgs(@"EOMKKD", @"key=%@ RETAINCOUNT=%d",
key, [key retainCount]);
@ -127,7 +127,7 @@ RCS_ID("$Id$")
NSAssert1(!oldValue, @"%@ already present", key);
}
EOFLOGObjectLevelArgs(@"EOMKKD", @"self=%p", self);
}
return self;
@ -152,14 +152,14 @@ RCS_ID("$Id$")
}
}
EOFLOGObjectLevelArgs(@"EOMKKD", @"self=%p", self);
return self;
}
- (void)dealloc
{
EOFLOGObjectLevelArgs(@"EOMKKD", @"Deallocate EOMKKDInitliazer %p", self);
if (_keyToIndex)
NSFreeMapTable(_keyToIndex);
@ -282,10 +282,10 @@ RCS_ID("$Id$")
destinationDescription: self
zone: [self zone]] autorelease];
EOFLOGObjectLevelArgs(@"EOMKKD", @"sourceDescription=%@", sourceInitializer);
EOFLOGObjectLevelArgs(@"EOMKKD", @"destinationDescription=%@", self);
EOFLOGObjectLevelArgs(@"EOMKKD", @"sourceKeys=%@", sourceKeys);
EOFLOGObjectLevelArgs(@"EOMKKD", @"destinationKeys=%@", destinationKeys);
if (keyCount>0)
{
@ -304,11 +304,11 @@ RCS_ID("$Id$")
sourceKey =
GDL2_ObjectAtIndexWithImp(sourceKeys,sourceObjectAtIndexIMP,i);
EOFLOGObjectLevelArgs(@"EOMKKD", @"sourceKey=%@", sourceKey);
destinationKey =
GDL2_ObjectAtIndexWithImp(destinationKeys,destinationObjectAtIndexIMP,i);
EOFLOGObjectLevelArgs(@"EOMKKD", @"destinationKey=%@", destinationKey);
destinationIndex =
EOMKKDInitializer_indexForKeyWithImpPtr(self,
@ -321,7 +321,7 @@ RCS_ID("$Id$")
EOMKKDInitializer_indexForKeyWithImpPtr(sourceInitializer,
&sourceInitializerIndexForKeyIMP,
sourceKey);
EOFLOGObjectLevelArgs(@"EOMKKD", @"sourceIndex=%d", sourceIndex);
NSAssert2(destinationIndex != NSNotFound,
@"Destination Key %@ not found in %@",
@ -360,11 +360,11 @@ RCS_ID("$Id$")
NSInteger index;
key = _keys[i];
EOFLOGObjectLevelArgs(@"EOMKKD", @"key=%@", key);
index = EOMKKDInitializer_indexForKeyWithImpPtr(sourceInitializer,
&indexForKeyIMP,key);
EOFLOGObjectLevelArgs(@"EOMKKD", @"index=%d", index);
subsetMapping->_sourceOffsetForDestinationOffset[i]
= (index == NSNotFound ? 0 : index + 1);
@ -411,7 +411,7 @@ RCS_ID("$Id$")
- (void) dealloc
{
// EOFLOGObjectLevelArgs(@"EOMKKD",@"Deallocate EOMKKDEnumerator %p (target=%p)",self,_target);
//
DESTROY(_target);
DESTROY(_extraEnumerator);
@ -583,14 +583,14 @@ RCS_ID("$Id$")
NSAssert(dict, @"No dictionary");
NSAssert(subsetMapping, @"No subsetMapping");
EOFLOGObjectLevelArgs(@"EOMKKD", @"dict=%@", dict);
EOFLOGObjectLevelArgs(@"EOMKKD", @"subsetMapping->_sourceDescription=%@",
subsetMapping->_sourceDescription);
EOFLOGObjectLevelArgs(@"EOMKKD", @"subsetMapping->_destinationDescription=%@",
subsetMapping->_destinationDescription);
objectsCount = [subsetMapping->_destinationDescription count];
EOFLOGObjectLevelArgs(@"EOMKKD", @"objectsCount=%d", objectsCount);
if (objectsCount > 0)
{
@ -605,13 +605,13 @@ RCS_ID("$Id$")
{
NSUInteger index = subsetMapping->_sourceOffsetForDestinationOffset[i] - 1;
EOFLOGObjectLevelArgs(@"EOMKKD", @"index=%d", index);
objects[i] = [subsetMapping->_sourceDescription
objectForIndex: index
dictionary: dict];
EOFLOGObjectLevelArgs(@"EOMKKD", @"objects[i]=%@", objects[i]);
NSAssert2(objects[i], @"No object for index %d from row %@",
index,
dict);
@ -626,7 +626,7 @@ RCS_ID("$Id$")
newDict = [self newWithInitializer: subsetMapping->_destinationDescription
zone: zone];
EOFLOGObjectLevel(@"EOMKKD", @"END");
return newDict;
}
@ -698,25 +698,25 @@ RCS_ID("$Id$")
- (id) initWithInitializer: (EOMKKDInitializer*)initializer
{
EOFLOGObjectFnStart();
if ((self = [self init]))
{
NSUInteger count;
NSAssert(initializer, @"No Initializer");
EOFLOGObjectLevel(@"EOMKKD", @"suite");
ASSIGN(_MKKDInitializer, initializer);
count = [_MKKDInitializer count];
EOFLOGObjectLevelArgs(@"EOMKKD", @"count=%d", count);
_values = NSZoneMalloc([self zone], count * sizeof(id));
memset(_values, 0, count * sizeof(id));
}
EOFLOGObjectFnStop();
return self;
}
@ -724,7 +724,7 @@ RCS_ID("$Id$")
- (id) initWithInitializer: (EOMKKDInitializer*)initializer
objects: (id*)objects
{
EOFLOGObjectFnStart();
if ((self = [self initWithInitializer: initializer]))
{
@ -736,7 +736,7 @@ RCS_ID("$Id$")
NSUInteger i;
NSUInteger count = [_MKKDInitializer count];
EOFLOGObjectLevelArgs(@"EOMKKD", @"count=%d", count);
for (i = 0; i < count; i++)
{
@ -747,7 +747,7 @@ RCS_ID("$Id$")
}
}
EOFLOGObjectLevel(@"EOMKKD", @"END");
return self;
}
@ -760,7 +760,7 @@ RCS_ID("$Id$")
//OK
EOMKKDInitializer *initializer = nil;
EOFLOGObjectFnStart();
if (count > 0)
{
@ -771,7 +771,7 @@ RCS_ID("$Id$")
count: count] autorelease];
NSAssert(initializer, @"No Initializer");
EOFLOGObjectLevel(@"EOMKKD", @"suite");
ASSIGN(_MKKDInitializer, initializer);
@ -797,7 +797,7 @@ RCS_ID("$Id$")
- (void) dealloc
{
EOFLOGObjectLevelArgs(@"EOMKKD", @"Deallocate EOMKKDDictionary %p", self);
if (_values)
{
@ -916,7 +916,7 @@ RCS_ID("$Id$")
}
}
EOFLOGObjectLevelArgs(@"EOMKKD", @"result = %s", (result ? "YES" : "NO"));
return result;
}

4
EOControl/EONull.m
View file

@ -56,8 +56,8 @@ RCS_ID("$Id$")
- (NSString *)sqlString
{
EOFLOGObjectFnStart();
EOFLOGObjectFnStop();
return @"NULL";
}

22
EOControl/EOObjectStoreCoordinator.m
View file

@ -180,7 +180,7 @@ NSString *EOCooperatingObjectStoreNeeded = @"EOCooperatingObjectStoreNeeded";
if ([store ownsGlobalID: globalID] == YES)
return store;
NSDebugMLLog(@"gsdb", @"num=%d", num);
if(--num)
[self requestStoreForGlobalID: globalID
@ -205,7 +205,7 @@ NSString *EOCooperatingObjectStoreNeeded = @"EOCooperatingObjectStoreNeeded";
if ([store ownsObject: object] == YES)
return store;
NSDebugMLLog(@"gsdb", @"num=%d", num);
if(--num)
[[NSNotificationCenter defaultCenter]
@ -232,7 +232,7 @@ NSString *EOCooperatingObjectStoreNeeded = @"EOCooperatingObjectStoreNeeded";
if ([store handlesFetchSpecification: fetchSpecification] == YES)
return store;
NSDebugMLLog(@"gsdb", @"num=%d", num);
if(--num)
[[NSNotificationCenter defaultCenter]
@ -341,7 +341,7 @@ NSString *EOCooperatingObjectStoreNeeded = @"EOCooperatingObjectStoreNeeded";
NSException *exception = nil;
int i, count;
EOFLOGObjectFnStart();
insertedObjects = [context insertedObjects];
count = [insertedObjects count];
@ -447,7 +447,7 @@ NSString *EOCooperatingObjectStoreNeeded = @"EOCooperatingObjectStoreNeeded";
if (exception)
[exception raise];
EOFLOGObjectFnStop();
}
- (NSArray *)objectsWithFetchSpecification: (EOFetchSpecification *)fetch
@ -483,7 +483,7 @@ NSString *EOCooperatingObjectStoreNeeded = @"EOCooperatingObjectStoreNeeded";
*/
- (void) _objectsChangedInSubStore: (NSNotification*)notification
{
EOFLOGObjectFnStart();
if ([notification object] != self)
{
@ -493,7 +493,7 @@ NSString *EOCooperatingObjectStoreNeeded = @"EOCooperatingObjectStoreNeeded";
userInfo: [notification userInfo]];
}
EOFLOGObjectFnStop();
}
- (void)invalidateAllObjects
@ -501,14 +501,14 @@ NSString *EOCooperatingObjectStoreNeeded = @"EOCooperatingObjectStoreNeeded";
EOCooperatingObjectStore *store;
NSEnumerator *storeEnum;
EOFLOGObjectFnStart();
storeEnum = [_stores objectEnumerator];
while ((store = [storeEnum nextObject]))
[store invalidateAllObjects];
EOFLOGObjectFnStop();
}
- (void)invalidateObjectsWithGlobalIDs: (NSArray *)globalIDs
@ -520,7 +520,7 @@ NSString *EOCooperatingObjectStoreNeeded = @"EOCooperatingObjectStoreNeeded";
NSMutableArray *array;
unsigned i,n;
EOFLOGObjectFnStart();
gidsByStore = NSCreateMapTable(NSNonOwnedPointerMapKeyCallBacks,
NSNonOwnedPointerMapValueCallBacks,
@ -551,7 +551,7 @@ NSString *EOCooperatingObjectStoreNeeded = @"EOCooperatingObjectStoreNeeded";
NSEndMapTableEnumeration(&gbsEnum);
NSFreeMapTable(gidsByStore);
EOFLOGObjectFnStop();
}
- (void)lockObjectWithGlobalID: (EOGlobalID *)gid

2
EOControl/EOOrQualifier.m
View file

@ -169,7 +169,7 @@ RCS_ID("$Id$")
int i=0;
int count=[_qualifiers count];
NSMutableArray* newQualifiers=nil;
EOFLOGObjectLevelArgs(@"EOQualifier", @"bindings=%@", bindings);
for(i=0;i<count;i++)
{

4
EOControl/EOSortOrdering.m
View file

@ -140,7 +140,7 @@ RCS_ID("$Id$")
- (id) initWithKeyValueUnarchiver: (EOKeyValueUnarchiver*)unarchiver
{
EOFLOGObjectFnStartOrCond(@"EOSortOrdering");
if ((self = [super init]))
{
@ -153,7 +153,7 @@ RCS_ID("$Id$")
_selector = NSSelectorFromString(selectorName);
}
EOFLOGObjectFnStopOrCond(@"EOSortOrdering");
return self;
}

8
EOControl/EOUndoManager.m
View file

@ -48,20 +48,20 @@ RCS_ID("$Id$")
- (void) forgetAllWithTarget: (id)target
{
EOFLOGObjectFnStart();
[self notImplemented: _cmd]; //TODO
EOFLOGObjectFnStop();
}
- (void) forgetAll
{
EOFLOGObjectFnStart();
[self notImplemented: _cmd]; //TODO
EOFLOGObjectFnStop();
}
- (void) registerUndoWithTarget: (id)target