fixed some child-key issue

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

diff --git a/sope-appserver/NGObjWeb/ChangeLog b/sope-appserver/NGObjWeb/ChangeLog
index 4313bbe89d0db6d427eb9f2f646c13077ce0929b..9a9ff266394006fdc2953f22a84729e4fc031312 100644 (file)
--- a/sope-appserver/NGObjWeb/ChangeLog
+++ b/sope-appserver/NGObjWeb/ChangeLog
@@ -1,5 +1,9 @@
 2004-10-08  Helge Hess  <helge.hess@opengroupware.org>
 
+       * WebDAV/SoObjectDataSource.m: ensure that the child key used for
+         lookup is a string (eg if toOneRelationshipKeys returns NSNumber's
+         as values) (v4.3.57)
+
        * WebDAV/SoObjectDataSource.m: minor optimization to URL generation
          (v4.3.56)
 

diff --git a/sope-appserver/NGObjWeb/Version b/sope-appserver/NGObjWeb/Version
index ccd73ff08953feede4a47471aa6ac4dfebd260c3..dbfcd8ee53aae418a779d6e3686884b5dd4cc92b 100644 (file)
--- a/sope-appserver/NGObjWeb/Version
+++ b/sope-appserver/NGObjWeb/Version
@@ -1,6 +1,6 @@
 # version file
 
-SUBMINOR_VERSION:=56
+SUBMINOR_VERSION:=57
 
 # v4.3.42  requires libNGExtensions v4.3.116
 # v4.3.40  requires libNGExtensions v4.3.115

diff --git a/sope-appserver/NGObjWeb/WebDAV/SoObjectDataSource.m b/sope-appserver/NGObjWeb/WebDAV/SoObjectDataSource.m
index 477ab3d76968950ea1c00711dbdade9b25737214..61c8b842991f7c01b4800ec904cdd7f17dcce902 100644 (file)
--- a/sope-appserver/NGObjWeb/WebDAV/SoObjectDataSource.m
+++ b/sope-appserver/NGObjWeb/WebDAV/SoObjectDataSource.m
@@ -126,7 +126,7 @@ static BOOL debugOn = NO;
     
   queriedAttrNames = [_fs selectedWebDAVPropertyNames];
   
-  while ((childKey = [childKeys nextObject])) {
+  while ((childKey = [[childKeys nextObject] stringValue]) != nil) {
     NSDictionary *rec;
     NSException  *e;
     NSString     *childHref;