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 00889fb014c221201db71766bb08f65c6666ee86..1d87db8bc1f2fcc7e591b1e89b80f1b6046f6bc0 100644 (file)
--- 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 237dc6cd6cc05a74e25bddd908968f86e2eb306c..e3da32cd4eae3c0906275ef8b93c5da93667b60f 100644 (file)
--- 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 c3f4689da5f6ff3f5ae01a8389d38a9ded681921..127ddfb6f9466ec414d6b070c8467c0cc15961ac 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.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 4568ee13141b9cec159fdb913fbd21bf9543180c..3519256f9a5f8f881d8747aea43ddb2d0e3dd652 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.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 0dedcd9b1a46cf47b5273cca18312ed659f32b4e..527e623323b1ced1800cb2cea47745d6134c52f9 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.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 40fbc50d5c238a2afc478c9e2ce9bb7dd8bb275d..d8a413a6571e40f7a11e1d37592ac1e1dd2b132c 100644 (file)
--- 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 a6059fa66bef0cd63acf987a3cf7071117b8b8db..4e5aacd471259f3551831d9dd8296993745f78d3 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.100;
+                               DYLIB_CURRENT_VERSION = 4.5.102;
                                FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks";
                                FRAMEWORK_VERSION = A;
                                GCC_PRECOMPILE_PREFIX_HEADER = NO;