From: znek <znek@e4a50df8-12e2-0310-a44c-efbce7f8a7e3>
Date: Sat, 18 Dec 2004 14:39:39 +0000 (+0000)
Subject: Bugfix, bumped version for Xcode
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2bc1bcfb12042b1fecbd67edfe77c1bf9447b22e;p=sope

Bugfix, bumped version for Xcode

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

diff --git a/sope-appserver/NGObjWeb/ChangeLog b/sope-appserver/NGObjWeb/ChangeLog
index 00889fb0..1d87db8b 100644
--- a/sope-appserver/NGObjWeb/ChangeLog
+++ b/sope-appserver/NGObjWeb/ChangeLog
@@ -1,3 +1,9 @@
+2004-12-18  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+	* DynamicElements/WORepetition.m: bugfix in -appendToResponse:... for
+	  case when only "count" and "index" are set (this didn't work because
+	  of erroneous use of -pushCursor/-popCursor) (v4.5.102)
+
 2004-12-14  Marcus Mueller  <znek@mulle-kybernetik.com>
 
 	* NGObjWeb.xcode: minor changes and updated
diff --git a/sope-appserver/NGObjWeb/DynamicElements/WORepetition.m b/sope-appserver/NGObjWeb/DynamicElements/WORepetition.m
index 237dc6cd..e3da32cd 100644
--- a/sope-appserver/NGObjWeb/DynamicElements/WORepetition.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/WORepetition.m
@@ -382,9 +382,10 @@ _applyIndex(_WOComplexRepetition *self, WOComponent *sComponent, unsigned _idx)
       }
 
       if (debugTakeValues) {
-	[[_ctx component] 
-	  debugWithFormat:@"%@<%@>: let template take values ..",
-	    [_ctx elementID], NSStringFromClass([self class])];
+        [[_ctx component] debugWithFormat:@"%@<%@>: "
+                                          @"let template take values ..",
+                                            [_ctx elementID],
+                                            NSStringFromClass([self class])];
       }
       
       [self->template takeValuesFromRequest:_request inContext:_ctx];
@@ -422,9 +423,8 @@ _applyIndex(_WOComplexRepetition *self, WOComponent *sComponent, unsigned _idx)
 #if DEBUG
   if (descriptiveIDs) {
     if (![[_ctx currentElementID] isEqualToString:self->repName]) {
-      [[_ctx session]
-             logWithFormat:@"%s: %@ missing repetition ID 'R' !",
-               __PRETTY_FUNCTION__, self];
+      [[_ctx session] logWithFormat:@"%s: %@ missing repetition ID 'R' !",
+                                      __PRETTY_FUNCTION__, self];
       return nil;
     }
     [_ctx consumeElementID]; // consume 'R'
@@ -532,10 +532,6 @@ _applyIndex(_WOComplexRepetition *self, WOComponent *sComponent, unsigned _idx)
       if (self->item) {
         [self->item setValue:lItem inComponent:sComponent];
       }
-      else {
-	/* push cursor */
-	[_ctx pushCursor:lItem];
-      }
       
       /* get identifier used for action-links */
       
@@ -567,10 +563,6 @@ _applyIndex(_WOComplexRepetition *self, WOComponent *sComponent, unsigned _idx)
     if (self->identifier == nil)
       [_ctx deleteLastElementIDComponent]; /* repetition index */
 
-    if (self->item == nil) {
-      [_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 c3f4689d..127ddfb6 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.100;
+				DYLIB_CURRENT_VERSION = 4.5.102;
 				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 4568ee13..3519256f 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.100;
+				DYLIB_CURRENT_VERSION = 4.5.102;
 				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 0dedcd9b..527e6233 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.100;
+				DYLIB_CURRENT_VERSION = 4.5.102;
 				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 40fbc50d..d8a413a6 100644
--- a/sope-appserver/NGObjWeb/Version
+++ b/sope-appserver/NGObjWeb/Version
@@ -1,6 +1,6 @@
 # version file
 
-SUBMINOR_VERSION:=100
+SUBMINOR_VERSION:=102
 
 # v4.5.91  requires libNGExtensions v4.5.134
 # v4.5.84  requires libNGExtensions v4.5.127
diff --git a/sope-appserver/NGObjWeb/WebDAV/WebDAV.xcode/project.pbxproj b/sope-appserver/NGObjWeb/WebDAV/WebDAV.xcode/project.pbxproj
index a6059fa6..4e5aacd4 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.100;
+				DYLIB_CURRENT_VERSION = 4.5.102;
 				FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				FRAMEWORK_VERSION = A;
 				GCC_PRECOMPILE_PREFIX_HEADER = NO;