bugfixes, bumped version for Xcode projects

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

diff --git a/sope-appserver/NGObjWeb/ChangeLog b/sope-appserver/NGObjWeb/ChangeLog
index 1d87db8bc1f2fcc7e591b1e89b80f1b6046f6bc0..734dc807c83811f4f0e04ac90c8ef991817afe6d 100644 (file)
--- a/sope-appserver/NGObjWeb/ChangeLog
+++ b/sope-appserver/NGObjWeb/ChangeLog
@@ -1,3 +1,13 @@
+2004-12-19  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+       * v4.5.103
+
+       * WOContext.m: fixed bug in -pushCursor:, first element in newly
+         allocated stack was never set
+
+       * DynamicElements/WORepetition.m: reverted use of -pushCursor/
+         -popCursor for ComplexRepetition, but only in case index is not used.
+
 2004-12-18  Marcus Mueller  <znek@mulle-kybernetik.com>
 
        * DynamicElements/WORepetition.m: bugfix in -appendToResponse:... for

diff --git a/sope-appserver/NGObjWeb/DynamicElements/WORepetition.m b/sope-appserver/NGObjWeb/DynamicElements/WORepetition.m
index e3da32cd4eae3c0906275ef8b93c5da93667b60f..3531f3b508bf523f582ba2d24b1b2b12afc573df 100644 (file)
--- a/sope-appserver/NGObjWeb/DynamicElements/WORepetition.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/WORepetition.m
@@ -532,7 +532,12 @@ _applyIndex(_WOComplexRepetition *self, WOComponent *sComponent, unsigned _idx)
       if (self->item) {
         [self->item setValue:lItem inComponent:sComponent];
       }
-      
+      else {
+        if (!self->index) {
+          [_ctx pushCursor:lItem];
+        }
+      }
+
       /* get identifier used for action-links */
       
       if (self->identifier) {
@@ -563,6 +568,9 @@ _applyIndex(_WOComplexRepetition *self, WOComponent *sComponent, unsigned _idx)
     if (self->identifier == nil)
       [_ctx deleteLastElementIDComponent]; /* repetition index */
 
+    if (!self->item && !self->index)
+      [_ctx popCursor];
+
     //if (self->index) [self->index setUnsignedIntValue:0];
     //if (self->item)  [self->item  setValue:nil];
   }

diff --git a/sope-appserver/NGObjWeb/NGHttp/NGHttp.xcode/project.pbxproj b/sope-appserver/NGObjWeb/NGHttp/NGHttp.xcode/project.pbxproj
index 127ddfb6f9466ec414d6b070c8467c0cc15961ac..b6ca507c87669bc22a9687cb64f715b2fb643919 100644 (file)
--- a/sope-appserver/NGObjWeb/NGHttp/NGHttp.xcode/project.pbxproj
+++ b/sope-appserver/NGObjWeb/NGHttp/NGHttp.xcode/project.pbxproj
@@ -464,7 +464,7 @@
                        );
                        buildSettings = {
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.5.102;
+                               DYLIB_CURRENT_VERSION = 4.5.103;
                                FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks";
                                FRAMEWORK_VERSION = A;
                                GCC_PRECOMPILE_PREFIX_HEADER = YES;

diff --git a/sope-appserver/NGObjWeb/NGObjWeb.xcode/project.pbxproj b/sope-appserver/NGObjWeb/NGObjWeb.xcode/project.pbxproj
index 3519256f9a5f8f881d8747aea43ddb2d0e3dd652..368c8773549f71ff5071ff70cf1b910992b31d58 100644 (file)
--- a/sope-appserver/NGObjWeb/NGObjWeb.xcode/project.pbxproj
+++ b/sope-appserver/NGObjWeb/NGObjWeb.xcode/project.pbxproj
@@ -1655,7 +1655,7 @@
                        );
                        buildSettings = {
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.5.102;
+                               DYLIB_CURRENT_VERSION = 4.5.103;
                                FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks";
                                FRAMEWORK_VERSION = A;
                                GCC_PRECOMPILE_PREFIX_HEADER = YES;

diff --git a/sope-appserver/NGObjWeb/SoObjects/SoObjects.xcode/project.pbxproj b/sope-appserver/NGObjWeb/SoObjects/SoObjects.xcode/project.pbxproj
index 527e623323b1ced1800cb2cea47745d6134c52f9..a81343ea56089cbd245b43254180acecf3b4ee78 100644 (file)
--- a/sope-appserver/NGObjWeb/SoObjects/SoObjects.xcode/project.pbxproj
+++ b/sope-appserver/NGObjWeb/SoObjects/SoObjects.xcode/project.pbxproj
@@ -289,7 +289,7 @@
                        );
                        buildSettings = {
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.5.102;
+                               DYLIB_CURRENT_VERSION = 4.5.103;
                                FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks";
                                FRAMEWORK_VERSION = A;
                                GCC_PRECOMPILE_PREFIX_HEADER = NO;

diff --git a/sope-appserver/NGObjWeb/Version b/sope-appserver/NGObjWeb/Version
index d8a413a6571e40f7a11e1d37592ac1e1dd2b132c..5984d7cc5d5b0318af603505334230f509bf3280 100644 (file)
--- a/sope-appserver/NGObjWeb/Version
+++ b/sope-appserver/NGObjWeb/Version
@@ -1,6 +1,6 @@
 # version file
 
-SUBMINOR_VERSION:=102
+SUBMINOR_VERSION:=103
 
 # v4.5.91  requires libNGExtensions v4.5.134
 # v4.5.84  requires libNGExtensions v4.5.127

diff --git a/sope-appserver/NGObjWeb/WOContext.m b/sope-appserver/NGObjWeb/WOContext.m
index a9187d550dffcbe690248013d2c5092f6f1f2cdd..70dd7c06924a86a8997ffdca159cda33b2035e42 100644 (file)
--- a/sope-appserver/NGObjWeb/WOContext.m
+++ b/sope-appserver/NGObjWeb/WOContext.m
@@ -994,19 +994,16 @@ void WOContext_leaveComponent(WOContext *self, WOComponent *_component) {
 @implementation WOComponent(Cursors)
 
 - (void)pushCursor:(id)_obj {
-  NSMutableArray *ctxStack;
-  
   if (debugCursor)
     [self logWithFormat:@"enter cursor: %@", _obj];
   
-  if ((ctxStack = self->cycleContext) == nil)
+  if (!self->cycleContext)
     self->cycleContext = [[NSMutableArray alloc] initWithCapacity:8];
   
   /* add to cursor stack */
-  [ctxStack addObject:(_obj ? _obj : [NSNull null])];
+  [self->cycleContext addObject:(_obj ? _obj : [NSNull null])];
   
   /* set active cursor */
-  if (![_obj isNotNull]) _obj = nil;
   [self setObject:_obj forKey:@"_"];
 }
 

diff --git a/sope-appserver/NGObjWeb/WebDAV/WebDAV.xcode/project.pbxproj b/sope-appserver/NGObjWeb/WebDAV/WebDAV.xcode/project.pbxproj
index 4e5aacd471259f3551831d9dd8296993745f78d3..5390e68d8cde50b82d8b5101d48e80ac2403e94b 100644 (file)
--- a/sope-appserver/NGObjWeb/WebDAV/WebDAV.xcode/project.pbxproj
+++ b/sope-appserver/NGObjWeb/WebDAV/WebDAV.xcode/project.pbxproj
@@ -229,7 +229,7 @@
                        );
                        buildSettings = {
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.5.102;
+                               DYLIB_CURRENT_VERSION = 4.5.103;
                                FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks";
                                FRAMEWORK_VERSION = A;
                                GCC_PRECOMPILE_PREFIX_HEADER = NO;