code cleanups

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

diff --git a/sope-appserver/NGObjWeb/ChangeLog b/sope-appserver/NGObjWeb/ChangeLog
index 86d48a4a292481a2a1b6e53e75fa5d6f4a69573a..471dec46c327ba0d303d6eed08209ee241744f06 100644 (file)
--- a/sope-appserver/NGObjWeb/ChangeLog
+++ b/sope-appserver/NGObjWeb/ChangeLog
@@ -1,3 +1,7 @@
+2005-08-04  Helge Hess  <helge.hess@opengroupware.org>
+
+       * minor code cleanups (v4.5.182)
+
 2005-08-03  Helge Hess  <helge.hess@opengroupware.org>
 
        * WODisplayGroup.m: detect whether an EOEditingContext is available at

diff --git a/sope-appserver/NGObjWeb/Version b/sope-appserver/NGObjWeb/Version
index 818fe82bfb412048223cda339fd41b3caf996d56..b14095bcd334312ce58ac99fb71406b8924315eb 100644 (file)
--- a/sope-appserver/NGObjWeb/Version
+++ b/sope-appserver/NGObjWeb/Version
@@ -1,6 +1,6 @@
 # version file
 
-SUBMINOR_VERSION:=181
+SUBMINOR_VERSION:=182
 
 # v4.5.122 requires libNGExtensions v4.5.153
 # v4.5.91  requires libNGExtensions v4.5.134

diff --git a/sope-appserver/NGObjWeb/WOComponent.m b/sope-appserver/NGObjWeb/WOComponent.m
index 97a4370b885c190078b1af68f1e753433601e4e8..39a115f71c3d81e8487236c3b3ece41ef59891c8 100644 (file)
--- a/sope-appserver/NGObjWeb/WOComponent.m
+++ b/sope-appserver/NGObjWeb/WOComponent.m
@@ -1176,6 +1176,14 @@ static inline id _getExtraVar(WOComponent *self, NSString *_key) {
 - (id)unarchiver:(EOKeyValueUnarchiver *)_archiver 
   objectForReference:(id)_keyPath
 {
+  /* 
+     This is used when a .woo file is unarchived. Eg datasources contain
+     bindings in the archive:
+     
+       editingContext = session.defaultEditingContext;
+     
+     The binding will evaluate against the component during loading.
+  */
   return [self valueForKeyPath:_keyPath];
 }
 

diff --git a/sope-appserver/NGObjWeb/WOComponentDefinition.m b/sope-appserver/NGObjWeb/WOComponentDefinition.m
index 07b9bc47047bcaa88723c310075792f5db392be4..6e109242c143356c83b8b17ca3bb4af36f35260b 100644 (file)
--- a/sope-appserver/NGObjWeb/WOComponentDefinition.m
+++ b/sope-appserver/NGObjWeb/WOComponentDefinition.m
@@ -362,7 +362,7 @@ static NSArray *woxExtensions = nil;
   [unarchiver setDelegate:_component];
   
   keys = [_vars keyEnumerator];
-  while ((key = [keys nextObject])) {
+  while ((key = [keys nextObject]) != nil) {
     id object;
     
     object = [unarchiver decodeObjectForKey:key];

diff --git a/sope-appserver/NGObjWeb/WOServerSessionStore.m b/sope-appserver/NGObjWeb/WOServerSessionStore.m
index 96647e8b9e73ce75b08954f6d287bb0a0229c125..e036154f1b3e6559fdc53138221c57e71b8a0a43 100644 (file)
--- a/sope-appserver/NGObjWeb/WOServerSessionStore.m
+++ b/sope-appserver/NGObjWeb/WOServerSessionStore.m
@@ -247,16 +247,16 @@ static BOOL logExpiredSessions = NO;
   for (cnt = 0, count = [timedOut count]; cnt < count; cnt++) {
     NSString *sid;
           
-        info = [timedOut objectAtIndex:cnt];
-        sid  = [[info sessionID] copy];
+    info = [timedOut objectAtIndex:cnt];
+    sid  = [[info sessionID] copy];
           
-        NSMapRemove(self->activeSessions, sid);
-        NSMapRemove(self->idToSession,    sid);
+    NSMapRemove(self->activeSessions, sid);
+    NSMapRemove(self->idToSession,    sid);
           
-        [nc postNotificationName:WOSessionDidTimeOutNotification
-            object:sid];
-
-        [sid release];
+    [nc postNotificationName:WOSessionDidTimeOutNotification
+       object:sid];
+    
+    [sid release];
   }
 }
 

diff --git a/sope-appserver/samples/CoreDataBlog/GNUmakefile.preamble b/sope-appserver/samples/CoreDataBlog/GNUmakefile.preamble
index 744528b78c0abebb18d22471d5db5c7c49ea6159..d76595632a6a15fe9be2a3e975f526e8458c174b 100644 (file)
--- a/sope-appserver/samples/CoreDataBlog/GNUmakefile.preamble
+++ b/sope-appserver/samples/CoreDataBlog/GNUmakefile.preamble
@@ -17,7 +17,8 @@ ADDITIONAL_LDFLAGS += \
        -framework CoreServices
 
 ADDITIONAL_TOOL_LIBS += \
-       -lEOControl                     \
+       -lEOCoreData    \
+       -lEOControl     \
        -lDOM -lXmlRpc -lSaxObjC
 
 ADDITIONAL_LIB_DIRS += -L/usr/local/lib -L/usr/lib