From 7bdc0c3158c3c471ad9f78d155754e7b1948430b Mon Sep 17 00:00:00 2001 From: helge Date: Thu, 13 Jan 2005 23:52:31 +0000 Subject: [PATCH] minor fixes and cleanups git-svn-id: http://svn.opengroupware.org/SOPE/trunk@518 e4a50df8-12e2-0310-a44c-efbce7f8a7e3 --- sope-appserver/NGObjWeb/WORunLoop.m | 2 ++ sope-core/EOControl/ChangeLog | 4 ++++ sope-core/EOControl/EOFetchSpecification.m | 15 ++++++++------- sope-core/EOControl/Version | 2 +- sope-gdl1/GDLAccess/EOAdaptorDataSource.m | 3 ++- sope-gdl1/PostgreSQL/ChangeLog | 5 +++++ sope-gdl1/PostgreSQL/EOAttribute+PostgreSQL72.m | 4 ++++ sope-gdl1/PostgreSQL/Version | 2 +- sope-mime/NGMime/GNUmakefile | 1 - 9 files changed, 27 insertions(+), 11 deletions(-) diff --git a/sope-appserver/NGObjWeb/WORunLoop.m b/sope-appserver/NGObjWeb/WORunLoop.m index 4f9e1dec..69d8c1b6 100644 --- a/sope-appserver/NGObjWeb/WORunLoop.m +++ b/sope-appserver/NGObjWeb/WORunLoop.m @@ -22,6 +22,8 @@ #include "WORunLoop.h" #include "common.h" +// TODO: not used anymore? + #if 0 #if !LIB_FOUNDATION_LIBRARY && !APPLE_Foundation_LIBRARY && !NeXT_Foundation_LIBRARY diff --git a/sope-core/EOControl/ChangeLog b/sope-core/EOControl/ChangeLog index f07de317..52662fd4 100644 --- a/sope-core/EOControl/ChangeLog +++ b/sope-core/EOControl/ChangeLog @@ -1,3 +1,7 @@ +2005-01-14 Helge Hess + + * EOFetchSpecification.m: minor code cleanups (v4.5.50) + 2004-12-14 Marcus Mueller * EOControl.xcode: minor changes and updated diff --git a/sope-core/EOControl/EOFetchSpecification.m b/sope-core/EOControl/EOFetchSpecification.m index 99ef881b..b4e3fcc6 100644 --- a/sope-core/EOControl/EOFetchSpecification.m +++ b/sope-core/EOControl/EOFetchSpecification.m @@ -87,13 +87,14 @@ /* accessors */ - (void)setEntityName:(NSString *)_name { - if (_name != self->entityName) { -#if !LIB_FOUNDATION_BOEHM_GC - id tmp = self->entityName; -#endif - self->entityName = [_name copyWithZone:[self zone]]; - [tmp release]; - } + id tmp; + + if (_name == self->entityName) + return; + + tmp = self->entityName; + self->entityName = [_name copyWithZone:[self zone]]; + [tmp release]; } - (NSString *)entityName { return self->entityName; diff --git a/sope-core/EOControl/Version b/sope-core/EOControl/Version index 704a8fa2..f7227d67 100644 --- a/sope-core/EOControl/Version +++ b/sope-core/EOControl/Version @@ -1,3 +1,3 @@ # version file -SUBMINOR_VERSION:=49 +SUBMINOR_VERSION:=50 diff --git a/sope-gdl1/GDLAccess/EOAdaptorDataSource.m b/sope-gdl1/GDLAccess/EOAdaptorDataSource.m index 87482cff..63102f0d 100644 --- a/sope-gdl1/GDLAccess/EOAdaptorDataSource.m +++ b/sope-gdl1/GDLAccess/EOAdaptorDataSource.m @@ -243,7 +243,8 @@ static NSNotificationCenter *getNC(void ) { } - (NSArray *)fetchObjects { - /* TODO: split up this HUGE method! */ + // TODO: split up this HUGE method! + // TODO: all the SQL gen code should be moved to an appropriate object NSString *entityName = nil; NSString *whereExpr = nil; NSString *orderByExpr = nil; diff --git a/sope-gdl1/PostgreSQL/ChangeLog b/sope-gdl1/PostgreSQL/ChangeLog index 59511730..19a0b570 100644 --- a/sope-gdl1/PostgreSQL/ChangeLog +++ b/sope-gdl1/PostgreSQL/ChangeLog @@ -1,3 +1,8 @@ +2005-01-14 Helge Hess + + * EOAttribute+PostgreSQL72.m: map PG oid's to NSStrings (avoids issues + when fetching from core PG tables) (v4.5.40) + 2005-01-06 Helge Hess * NSCalendarDate+PGVal.m: fixed a warning on Xcode (v4.5.39) diff --git a/sope-gdl1/PostgreSQL/EOAttribute+PostgreSQL72.m b/sope-gdl1/PostgreSQL/EOAttribute+PostgreSQL72.m index 6a005fb0..ba788049 100644 --- a/sope-gdl1/PostgreSQL/EOAttribute+PostgreSQL72.m +++ b/sope-gdl1/PostgreSQL/EOAttribute+PostgreSQL72.m @@ -205,6 +205,10 @@ static NSString *PGSQL_TIMESTAMP_FORMAT = @"%Y-%m-%d %H:%M:%S%z"; else if ([_type isEqualToString:@"text"]) { [self setValueClassName:@"NSString"]; } + else if ([_type isEqualToString:@"oid"]) { + // TODO: is this correct? + [self setValueClassName:@"NSString"]; + } else { NSLog(@"%s: invalid argument %@", __PRETTY_FUNCTION__, _type); diff --git a/sope-gdl1/PostgreSQL/Version b/sope-gdl1/PostgreSQL/Version index e7d29c92..879a0a4c 100644 --- a/sope-gdl1/PostgreSQL/Version +++ b/sope-gdl1/PostgreSQL/Version @@ -1,3 +1,3 @@ # version file -SUBMINOR_VERSION:=39 +SUBMINOR_VERSION:=40 diff --git a/sope-mime/NGMime/GNUmakefile b/sope-mime/NGMime/GNUmakefile index 98f6ce6e..7165de9e 100644 --- a/sope-mime/NGMime/GNUmakefile +++ b/sope-mime/NGMime/GNUmakefile @@ -72,5 +72,4 @@ NGMime_OBJC_FILES = \ -include GNUmakefile.preamble include $(GNUSTEP_MAKEFILES)/subproject.make -include $(GNUSTEP_MAKEFILES)/tool.make -include GNUmakefile.postamble -- 2.39.5