From: helge <helge@e4a50df8-12e2-0310-a44c-efbce7f8a7e3>
Date: Fri, 8 Oct 2004 13:21:50 +0000 (+0000)
Subject: fixed some child-key issue
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ebc7f3a9445c7b79855f2f3b5f413cc93da08f46;p=sope

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 4313bbe8..9a9ff266 100644
--- 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 ccd73ff0..dbfcd8ee 100644
--- 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 477ab3d7..61c8b842 100644
--- 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;