From fd9022bec88b7afa8d747ebb7596089cd05dc576 Mon Sep 17 00:00:00 2001 From: helge Date: Thu, 7 Oct 2004 15:52:55 +0000 Subject: [PATCH] minor debugging improvement git-svn-id: http://svn.opengroupware.org/SOPE/trunk@228 e4a50df8-12e2-0310-a44c-efbce7f8a7e3 --- sope-appserver/NGObjWeb/ChangeLog | 4 ++++ sope-appserver/NGObjWeb/Version | 2 +- sope-appserver/NGObjWeb/WebDAV/SoObject+SoDAVQuery.m | 12 ++++++------ .../NGObjWeb/WebDAV/SoObjectWebDAVDispatcher.m | 4 ++-- 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/sope-appserver/NGObjWeb/ChangeLog b/sope-appserver/NGObjWeb/ChangeLog index ba7fe0f5..ceecba90 100644 --- a/sope-appserver/NGObjWeb/ChangeLog +++ b/sope-appserver/NGObjWeb/ChangeLog @@ -1,3 +1,7 @@ +2004-10-07 Helge Hess + + * WebDAV/SoObjectWebDAVDispatcher.m: added more debug output (v4.3.53) + 2004-10-04 Helge Hess * Templates/WOxElemBuilder.m: moved WOxTagClassElemBuilder to own file diff --git a/sope-appserver/NGObjWeb/Version b/sope-appserver/NGObjWeb/Version index 3818b211..531230f6 100644 --- a/sope-appserver/NGObjWeb/Version +++ b/sope-appserver/NGObjWeb/Version @@ -1,6 +1,6 @@ # version file -SUBMINOR_VERSION:=52 +SUBMINOR_VERSION:=53 # v4.3.42 requires libNGExtensions v4.3.116 # v4.3.40 requires libNGExtensions v4.3.115 diff --git a/sope-appserver/NGObjWeb/WebDAV/SoObject+SoDAVQuery.m b/sope-appserver/NGObjWeb/WebDAV/SoObject+SoDAVQuery.m index 55c2f183..706a4114 100644 --- a/sope-appserver/NGObjWeb/WebDAV/SoObject+SoDAVQuery.m +++ b/sope-appserver/NGObjWeb/WebDAV/SoObject+SoDAVQuery.m @@ -1,7 +1,7 @@ /* - Copyright (C) 2000-2003 SKYRIX Software AG + Copyright (C) 2002-2004 SKYRIX Software AG - This file is part of OGo + This file is part of OpenGroupware.org. OGo is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the @@ -18,7 +18,6 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -// $Id$ #include "SoObject+SoDAV.h" #include "SoObject.h" @@ -66,14 +65,14 @@ static int debugBulk = NO; // TODO: set to -1 and use defaults if ((q = (void *)[_fs qualifier])) { if (![q evaluateWithObject:self]) { - [self debugWithFormat:@" self doesn't match qualifier."]; + [self debugWithFormat:@" self does not match qualifier."]; return [NSArray array]; } } if ((keys = [_fs selectedWebDAVPropertyNames]) == nil) { /* - Note: this shouldn't happen anymore, a default-set will be used by + Note: this should not happen anymore, a default-set will be used by the dispatcher. */ keys = [[self soClassDescription] attributeKeys]; @@ -86,9 +85,10 @@ static int debugBulk = NO; // TODO: set to -1 and use defaults if ([_fs queryWebDAVPropertyNamesOnly]) { /* how does the renderer know, that these are the keys ? */ [self debugWithFormat:@"deliver keys only: %@", keys]; - return [NSArray arrayWithObject:keys]; + return keys != nil ? [NSArray arrayWithObject:keys] : nil; } + // TODO: we should map out certain keys, like 'retain', 'release' etc! if ((values = [self valuesForKeys:keys]) == nil) return nil; diff --git a/sope-appserver/NGObjWeb/WebDAV/SoObjectWebDAVDispatcher.m b/sope-appserver/NGObjWeb/WebDAV/SoObjectWebDAVDispatcher.m index ab731f5c..463f7495 100644 --- a/sope-appserver/NGObjWeb/WebDAV/SoObjectWebDAVDispatcher.m +++ b/sope-appserver/NGObjWeb/WebDAV/SoObjectWebDAVDispatcher.m @@ -18,7 +18,6 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -// $Id$ #include "SoObjectWebDAVDispatcher.h" #include "SoObject.h" @@ -491,10 +490,11 @@ static NSTimeZone *gmt = nil; { NSDictionary *map; - if ((map = [self->object davAttributeMapInContext:_ctx])) { + if ((map = [self->object davAttributeMapInContext:_ctx]) != nil) { [_ctx setObject:map forKey:@"DAVPropertyMap"]; fs = [fs fetchSpecificationByApplyingKeyMap:map]; [_ctx setObject:fs forKey:@"DAVMappedFetchSpecification"]; + if (debugOn) [self logWithFormat:@" remapped fetchspec: %@", fs]; } } -- 2.39.5