Monotone-Parent: 42e111d1ab25686092e392def5b8aa0c22f4d88b

Monotone-Revision: 4557052eb5dc8198cf068bbf758611f237e58e0f

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-06-04T22:38:43
Monotone-Branch: ca.inverse.sogo

SoObjects/Contacts/SOGoContactGCSFolder.m

@@ -89,22 +89,26 @@
           acquire: (BOOL) _flag
 {
   id obj;
+  BOOL isPut;
 
+  isPut = NO;
   /* first check attributes directly bound to the application */
   obj = [super lookupName:_key inContext:_ctx acquire:NO];
   if (!obj)
     {
       if ([[[_ctx request] method] isEqualToString: @"PUT"])
-        {
-          obj = [[SOGoContactGCSEntry alloc] initWithName: _key
-                                             inContainer: self];
-          [obj autorelease];
-        }
+	{
+	  if ([_key isEqualToString: @"PUT"])
+	    isPut = YES;
+	  else
+	    obj = [SOGoContactGCSEntry objectWithName: _key
+				       inContainer: self];
+	}
       else
         obj = [self lookupContactWithId: _key];
     }
-  if (!obj)
-    obj = [NSException exceptionWithHTTPStatus:404 /* Not Found */];
+//   if (!(obj || isPut))
+//     obj = [NSException exceptionWithHTTPStatus:404 /* Not Found */];
 
 // #if 0
 //     if ([[self ocsFolder] versionOfContentWithName:_key])

SoObjects/SOGo/SOGoContentObject.m

@@ -183,6 +183,22 @@
 
 /* actions */
 
+// - (id) lookupName:
+// {
+//   SoSelectorInvocation *invocation;
+//   NSString *name;
+
+//   name = [NSString stringWithFormat: @"%@:", [_key davMethodToObjC]];
+
+//   invocation = [[SoSelectorInvocation alloc]
+//                  initWithSelectorNamed: name
+//                  addContextParameter: YES];
+//   [invocation autorelease];
+
+//   return invocation;
+
+// }
+
 - (id) PUTAction: (WOContext *) _ctx
 {
   WORequest    *rq;

SoObjects/SOGo/SOGoFolder.m

@@ -24,6 +24,7 @@
 #import <GDLContentStore/GCSFolderManager.h>
 #import <GDLContentStore/GCSFolder.h>
 #import <GDLContentStore/GCSFolderType.h>
+#import <SaxObjC/XMLNamespaces.h>
 
 #import "SOGoPermissions.h"
 #import "SOGoFolder.h"
@@ -228,7 +229,7 @@ static NSString *defaultUserID = @"<default>";
   if ([self respondsToSelector: @selector (groupDavResourceType)])
     {
       groupDavCollection = [NSArray arrayWithObjects: [self groupDavResourceType],
-                                    @"http://groupdav.org/", @"G", nil];
+                                    XMLNS_GROUPDAV, nil];
       rType = [NSArray arrayWithObjects: @"collection", groupDavCollection, nil];
     }
   else