From f12a855ae2d23f4b481e076ac033165833f9725e Mon Sep 17 00:00:00 2001 From: helge Date: Mon, 1 May 2006 11:34:35 +0000 Subject: [PATCH] Added some WebDAV mappings for Novell NetDrive. git-svn-id: http://svn.opengroupware.org/SOPE/trunk@1257 e4a50df8-12e2-0310-a44c-efbce7f8a7e3 --- sope-appserver/NGObjWeb/ChangeLog | 8 ++++++++ sope-appserver/NGObjWeb/DAVPropMap.plist | 12 +++++++++--- sope-appserver/NGObjWeb/Version | 2 +- sope-appserver/NGObjWeb/WebDAV/SoObjectDataSource.m | 2 +- .../NGObjWeb/WebDAV/SoObjectWebDAVDispatcher.m | 4 ++-- 5 files changed, 21 insertions(+), 7 deletions(-) diff --git a/sope-appserver/NGObjWeb/ChangeLog b/sope-appserver/NGObjWeb/ChangeLog index 07f98f3c..d945385a 100644 --- a/sope-appserver/NGObjWeb/ChangeLog +++ b/sope-appserver/NGObjWeb/ChangeLog @@ -1,3 +1,11 @@ +2006-05-01 Helge Hess + + * v4.5.229 + + * DAVPropMap.plist: added some WebDAV mappings for Novell NetDrive + + * WebDAV: fixed some gcc 4.1 warnings + 2006-04-23 Helge Hess * SoObjects/SoObjectMethodDispatcher.m: added support for diff --git a/sope-appserver/NGObjWeb/DAVPropMap.plist b/sope-appserver/NGObjWeb/DAVPropMap.plist index bdd74533..aad54420 100644 --- a/sope-appserver/NGObjWeb/DAVPropMap.plist +++ b/sope-appserver/NGObjWeb/DAVPropMap.plist @@ -25,9 +25,15 @@ "{http://apache.org/dav/props/}executable" = "davIsExecutable"; /* used with Apple WebDAV */ - "{DAV:}quota" = davQuota; - "{DAV:}quotaused" = davQuotaUsed; - "{http://www.apple.com/webdav_fs/props/}appledoubleheader" = appleDoubleHeader; + "{DAV:}quota" = davQuota; + "{DAV:}quotaused" = davQuotaUsed; + "{http://www.apple.com/webdav_fs/props/}appledoubleheader"=appleDoubleHeader; + + /* Novell NetDrive */ + "{DAV:}owner" = davOwner; + "{DAV:}locktoken" = davLockToken; + "{DAV:}activelock" = davActiveLock; + "{DAV:}collection" = davNetDriveCollection; // TODO: non-standard? /* new in current WebFolders */ "{DAV:}defaultdocument" = davDefaultDocument; diff --git a/sope-appserver/NGObjWeb/Version b/sope-appserver/NGObjWeb/Version index ba6f797d..dc86cd93 100644 --- a/sope-appserver/NGObjWeb/Version +++ b/sope-appserver/NGObjWeb/Version @@ -1,6 +1,6 @@ # version file -SUBMINOR_VERSION:=228 +SUBMINOR_VERSION:=229 # v4.5.214 requires libNGExtensions v4.5.179 # v4.5.122 requires libNGExtensions v4.5.153 diff --git a/sope-appserver/NGObjWeb/WebDAV/SoObjectDataSource.m b/sope-appserver/NGObjWeb/WebDAV/SoObjectDataSource.m index 6824f766..3938c6d0 100644 --- a/sope-appserver/NGObjWeb/WebDAV/SoObjectDataSource.m +++ b/sope-appserver/NGObjWeb/WebDAV/SoObjectDataSource.m @@ -188,7 +188,7 @@ static BOOL debugOn = NO; // TODO: child can be SoHTTPException ? rec = (queriedAttrNames == nil) ? child - : [child valuesForKeys:queriedAttrNames]; + : (id)[child valuesForKeys:queriedAttrNames]; #if 0 [self logWithFormat:@"got values: %@ for keys: %@ from object: %@", rec, queriedAttrNames, child]; diff --git a/sope-appserver/NGObjWeb/WebDAV/SoObjectWebDAVDispatcher.m b/sope-appserver/NGObjWeb/WebDAV/SoObjectWebDAVDispatcher.m index 82f813d3..53f5eb73 100644 --- a/sope-appserver/NGObjWeb/WebDAV/SoObjectWebDAVDispatcher.m +++ b/sope-appserver/NGObjWeb/WebDAV/SoObjectWebDAVDispatcher.m @@ -158,7 +158,7 @@ static NSTimeZone *gmt = nil; [methodObject takeValuesFromRequest:[_ctx request] inContext:_ctx]; result = [methodObject callOnObject:self->object inContext:_ctx]; - return (result != nil) ? result : [NSNull null]; + return (result != nil) ? result : (id)[NSNull null]; } - (id)doGET:(WOContext *)_ctx { @@ -477,7 +477,7 @@ static NSTimeZone *gmt = nil; if ([s hasPrefix:@"_"]) s = [s substringFromIndex:1]; ids = ([s length] == 0) - ? [NSArray array] + ? (NSArray *)[NSArray array] : [s componentsSeparatedByString:@"_"]; // TODO: should use -stringByUnescapingURL on IDs (not required for ints) -- 2.39.5