From ee637f1df231a998bd7cd69306821f091639cc61 Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Fri, 27 Apr 2007 18:58:48 +0000
Subject: [PATCH] Monotone-Parent: 826bf932caacd3e649919ed612b65ec8aee72999
 Monotone-Revision: 475cf6d37855a59399d7920251b3b192b5353196

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-04-27T18:58:48
Monotone-Branch: ca.inverse.sogo
---
 SoObjects/SOGo/SOGoContentObject.m | 86 +++++++++++++++---------------
 1 file changed, 42 insertions(+), 44 deletions(-)

diff --git a/SoObjects/SOGo/SOGoContentObject.m b/SoObjects/SOGo/SOGoContentObject.m
index 3fb3ac8ea..ed75b3ce3 100644
--- a/SoObjects/SOGo/SOGoContentObject.m
+++ b/SoObjects/SOGo/SOGoContentObject.m
@@ -64,16 +64,22 @@
   ASSIGNCOPY(ocsPath, _path);
 }
 
-- (NSString *)ocsPath {
-  if (ocsPath == nil) {
-    NSString *p;
+- (NSString *) ocsPath
+{
+  NSString *p;
     
-    if ((p = [self ocsPathOfContainer]) != nil) {
-      if (![p hasSuffix:@"/"]) p = [p stringByAppendingString:@"/"];
-      p = [p stringByAppendingString:[self nameInContainer]];
-      ocsPath = [p copy];
+  if (!ocsPath)
+    {
+      p = [self ocsPathOfContainer];
+      if (p)
+	{
+	  if (![p hasSuffix:@"/"])
+	    p = [p stringByAppendingString: @"/"];
+	  ocsPath = [p stringByAppendingString: [self nameInContainer]];
+	  [ocsPath retain];
+	}
     }
-  }
+
   return ocsPath;
 }
 
@@ -233,48 +239,37 @@
   return [_ctx response];
 }
 
-/* security */
-// - (NSArray *) rolesOfUser: (NSString *) login
-// {
-//   NSMutableArray *sogoRoles;
-//   SOGoUser *user;
-
-//   sogoRoles = [NSMutableArray new];
-//   [sogoRoles autorelease];
-
-//   if (![container nameExistsInFolder: nameInContainer])
-//     {
-//       user = [[SOGoUser alloc] initWithLogin: login roles: nil];
-//       [sogoRoles addObjectsFromArray: [user rolesForObject: container
-//                                             inContext: context]];
-//       [user release];
-//     }
-
-//   return sogoRoles;
-// }
-
 /* E-Tags */
 
-- (id)davEntityTag {
+- (id) davEntityTag
+{
   // TODO: cache tag in ivar? => if you do, remember to flush after PUT
   GCSFolder *folder;
   char buf[64];
+  NSString *entityTag;
+  NSNumber *versionValue;
   
-  if ((folder = [self ocsFolder]) == nil) {
-    [self errorWithFormat:@"Did not find folder of content object."];
-    return nil;
-  }
-  
-  sprintf(buf, "\"gcs%08d\"",
-	  [[folder versionOfContentWithName:[self nameInContainer]]
-	    unsignedIntValue]);
-  return [NSString stringWithCString:buf];
+  folder = [self ocsFolder];
+  if (folder)
+    {
+      versionValue = [folder versionOfContentWithName: [self nameInContainer]];
+      sprintf (buf, "\"gcs%08d\"", [versionValue unsignedIntValue]);
+      entityTag = [NSString stringWithCString: buf];
+    }
+  else
+    {
+      [self errorWithFormat:@"Did not find folder of content object."];
+      entityTag = nil;
+    }
+
+  return entityTag;
 }
 
 /* WebDAV */
 
-- (NSException *)davMoveToTargetObject:(id)_target newName:(NSString *)_name
-  inContext:(id)_ctx
+- (NSException *) davMoveToTargetObject: (id) _target
+				newName: (NSString *) _name
+			      inContext: (id) _ctx
 {
   /*
     Note: even for new objects we won't get a new name but a preinstantiated
@@ -287,8 +282,9 @@
                       reason:@"this object cannot be copied via WebDAV"];
 }
 
-- (NSException *)davCopyToTargetObject:(id)_target newName:(NSString *)_name
-  inContext:(id)_ctx
+- (NSException *) davCopyToTargetObject: (id)_target
+				newName: (NSString *) _name
+			      inContext: (id) _ctx
 {
   /*
     Note: even for new objects we won't get a new name but a preinstantiated
@@ -349,13 +345,15 @@
 
 /* message type */
 
-- (NSString *)outlookMessageClass {
+- (NSString *) outlookMessageClass
+{
   return nil;
 }
 
 /* description */
 
-- (void)appendAttributesToDescription:(NSMutableString *)_ms {
+- (void) appendAttributesToDescription: (NSMutableString *) _ms
+{
   [super appendAttributesToDescription:_ms];
   
   [_ms appendFormat:@" ocs=%@", [self ocsPath]];