minor fixes and cleanups

git-svn-id: http://svn.opengroupware.org/SOPE/trunk@518 e4a50df8-12e2-0310-a44c-efbce7f8a7e3

diff --git a/sope-appserver/NGObjWeb/WORunLoop.m b/sope-appserver/NGObjWeb/WORunLoop.m
index 4f9e1decc0fd67af0cd65e6d79cf7054c593c10a..69d8c1b6c52a2f1b8b521d8bba0ea457166292f9 100644 (file)
--- 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 f07de317b0bae46f17f95556105d0edd4c093c7f..52662fd4b5ef1b0e792a40c5bbbc9059656ea454 100644 (file)
--- a/sope-core/EOControl/ChangeLog
+++ b/sope-core/EOControl/ChangeLog
@@ -1,3 +1,7 @@
+2005-01-14  Helge Hess  <helge.hess@opengroupware.org>
+
+       * EOFetchSpecification.m: minor code cleanups (v4.5.50)
+
 2004-12-14  Marcus Mueller  <znek@mulle-kybernetik.com>
 
        * EOControl.xcode: minor changes and updated

diff --git a/sope-core/EOControl/EOFetchSpecification.m b/sope-core/EOControl/EOFetchSpecification.m
index 99ef881bc4dbe67baec69eeb006fd53fb22b5836..b4e3fcc693410aa078098a584c3fbc320acf0df2 100644 (file)
--- 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 704a8fa27d1346e21ef88404845e691f6c157dca..f7227d67578bc35ca68e7d35f47fb431a29918ea 100644 (file)
--- 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 87482cff864879ebf452b8272acdef2ae03acae8..63102f0db57118105cd768b52c0378f49b9c0334 100644 (file)
--- 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 595117305548b8685d79025f2bd8566d27311383..19a0b570456718faf90638d860c37605fcba1919 100644 (file)
--- a/sope-gdl1/PostgreSQL/ChangeLog
+++ b/sope-gdl1/PostgreSQL/ChangeLog
@@ -1,3 +1,8 @@
+2005-01-14  Helge Hess  <helge.hess@opengroupware.org>
+
+       * 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  <helge.hess@opengroupware.org>
 
        * 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 6a005fb0db71402e39b3d945c86e9b3c12aa2f02..ba78804953644d999d21d89f4a498fa0f91d3a99 100644 (file)
--- 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 e7d29c921a855bd559753498611e745a1e90d1bf..879a0a4c45fc633d1425e9a7c7ec6011f1349348 100644 (file)
--- 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 98f6ce6e9719de4f4673da79500fdd33edea1783..7165de9e0ff7cd29f7226c8da43eeb67be1b72ef 100644 (file)
--- 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