From 0867ca8cf418f5cfd666b131b22b51f3b2fc72c3 Mon Sep 17 00:00:00 2001 From: David Ayers Date: Thu, 1 May 2008 18:08:18 +0000 Subject: [PATCH] * EOAccess/EODatabaseContext.m ([-initializeObject:row:entity:editingContext:]): Remove debug logs. * EOAccess/EOEntity.m ([-_dictionaryForInstanceProperties], [-primaryKeyForGlobalID:]) Remove debug logs. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gdl2/trunk@26481 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 7 +++++++ EOAccess/EODatabaseContext.m | 5 +---- EOAccess/EOEntity.m | 37 ++---------------------------------- 3 files changed, 10 insertions(+), 39 deletions(-) diff --git a/ChangeLog b/ChangeLog index 61e4e56..b3ce58a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-05-01 David Ayers + + * EOAccess/EODatabaseContext.m + ([-initializeObject:row:entity:editingContext:]): Remove debug logs. + * EOAccess/EOEntity.m ([-_dictionaryForInstanceProperties], + [-primaryKeyForGlobalID:]) Remove debug logs. + 2008-05-01 Matt Rice * EOAccess/EOEntityPriv.h: Declare new private method diff --git a/EOAccess/EODatabaseContext.m b/EOAccess/EODatabaseContext.m index a573f4b..6cabaf3 100644 --- a/EOAccess/EODatabaseContext.m +++ b/EOAccess/EODatabaseContext.m @@ -2284,9 +2284,6 @@ forDatabaseOperation:(EODatabaseOperation *)op } }; - NSLog(@"** %@ # %@", globalID, [op dbSnapshot]); - NSLog(@"-- %@", [op newRow]); - NSMapInsert(_dbOperationsByGlobalID, globalID, op); return op; @@ -6712,7 +6709,7 @@ Raises an exception is the adaptor is unable to perform the operations. if (![foreignKeyForSourceRow containsObjectsNotIdenticalTo: GDL2_EONull]) { - NSLog(@"foreignKeyForSourceRow=%@",foreignKeyForSourceRow); + NSLog(@"foreignKeyForSourceRow=%@",[foreignKeyForSourceRow debugDescription]); NSEmitTODO();//TODO: what to do if rel is mandatory ? relObject = nil; } diff --git a/EOAccess/EOEntity.m b/EOAccess/EOEntity.m index c79de43..16af828 100644 --- a/EOAccess/EOEntity.m +++ b/EOAccess/EOEntity.m @@ -1549,18 +1549,11 @@ createInstanceWithEditingContext:globalID:zone: //OK NSMutableDictionary *dictionaryForPrimaryKey = nil; - EOFLOGObjectFnStart(); - - NSDebugMLLog(@"EOEntity", @"gid=%@", gid); - if ([gid isKindOfClass: [EOKeyGlobalID class]]) //if ([gid isFinal])//?? or class test ??//TODO { NSArray *primaryKeyAttributeNames = [self primaryKeyAttributeNames]; int count = [primaryKeyAttributeNames count]; - NSDebugMLLog(@"EOEntity", @"primaryKeyAttributeNames=%@", - primaryKeyAttributeNames); - if (count > 0) { int i; @@ -1575,8 +1568,6 @@ createInstanceWithEditingContext:globalID:zone: NSAssert1(dictionaryForPrimaryKey, @"No dictionaryForPrimaryKey in entity %@", [self name]); - NSDebugMLLog(@"EOEntity", @"dictionaryForPrimaryKey=%@", - dictionaryForPrimaryKey); for (i = 0; i < count; i++) { @@ -1594,11 +1585,6 @@ createInstanceWithEditingContext:globalID:zone: _name, gid); } - NSDebugMLLog(@"EOEntity", @"dictionaryForPrimaryKey=%@", - dictionaryForPrimaryKey); - - EOFLOGObjectFnStop(); - return dictionaryForPrimaryKey; } @end @@ -2847,22 +2833,12 @@ createInstanceWithEditingContext:globalID:zone: EOMKKDInitializer *propertyDictionaryInitializer = nil; EOMutableKnownKeyDictionary *dictionaryForProperties = nil; - EOFLOGObjectFnStart(); - propertyDictionaryInitializer = [self _propertyDictionaryInitializer]; - EOFLOGObjectLevelArgs(@"EOEntity", @"propertyDictionaryInitializer=%@", - propertyDictionaryInitializer); - - dictionaryForProperties = [EOMutableKnownKeyDictionary - dictionaryWithInitializer: + dictionaryForProperties + = [EOMutableKnownKeyDictionary dictionaryWithInitializer: propertyDictionaryInitializer]; - EOFLOGObjectLevelArgs(@"EOEntity", @"dictionaryForProperties=%@", - dictionaryForProperties); - - EOFLOGObjectFnStop(); - return dictionaryForProperties; } @@ -2875,13 +2851,8 @@ returns nil if there's no key in the instanceDictionaryInitializer EOMKKDInitializer *instanceDictionaryInitializer = nil; EOMutableKnownKeyDictionary *dictionaryForProperties = nil; - EOFLOGObjectFnStart(); - instanceDictionaryInitializer = [self _instanceDictionaryInitializer]; - EOFLOGObjectLevelArgs(@"EOEntity", @"instanceDictionaryInitializer=%@", - instanceDictionaryInitializer); - // No need to build the dictionary if there's no key. // The only drawback I see is if someone use extraData feature of MKK dictionary if ([instanceDictionaryInitializer count]>0) @@ -2890,10 +2861,6 @@ returns nil if there's no key in the instanceDictionaryInitializer dictionaryWithInitializer: instanceDictionaryInitializer]; } - EOFLOGObjectLevelArgs(@"EOEntity", @"dictionaryForProperties=%@", - dictionaryForProperties); - - EOFLOGObjectFnStop(); return dictionaryForProperties; }