From: znek <znek@e4a50df8-12e2-0310-a44c-efbce7f8a7e3>
Date: Sun, 19 Dec 2004 17:52:16 +0000 (+0000)
Subject: bugfixes, bumped version for Xcode projects
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f50649a517286c327a5bfcfc4f4f5f8adee83ff7;p=sope

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 1d87db8b..734dc807 100644
--- 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 e3da32cd..3531f3b5 100644
--- 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 127ddfb6..b6ca507c 100644
--- 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 3519256f..368c8773 100644
--- 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 527e6233..a81343ea 100644
--- 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 d8a413a6..5984d7cc 100644
--- 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 a9187d55..70dd7c06 100644
--- 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 4e5aacd4..5390e68d 100644
--- 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;