fetch bodystructure

git-svn-id: http://svn.opengroupware.org/SOGo/trunk@347 d1b88da0-ebda-0310-925b-ed51d893ca5b

diff --git a/SOGo/SoObjects/Mailer/SOGoMailManager.m b/SOGo/SoObjects/Mailer/SOGoMailManager.m
index 8852c92e6cf91268154ca4eebbd72eb34c93e58f..1a66f0aaf3af093ff1972a6fc12ec79e071e39aa 100644 (file)
--- a/SOGo/SoObjects/Mailer/SOGoMailManager.m
+++ b/SOGo/SoObjects/Mailer/SOGoMailManager.m
@@ -385,7 +385,8 @@ static NSTimeInterval PoolScanInterval = 5 * 60;
     Allowed fetch keys:
       UID
       BODY.PEEK[<section>]<<partial>>
-      BODYSTRUCTURE
+      BODY            [this is the bodystructure, supported]
+      BODYSTRUCTURE   [not supported yet!]
       ENVELOPE        [this is a parsed header, but does not include type]
       FLAGS
       INTERNALDATE

diff --git a/SOGo/UI/Mailer/ChangeLog b/SOGo/UI/Mailer/ChangeLog
index 8a9d37ca008720637ea40fa8a426ebd0c1434cba..0c54098628470b00f2fef9634ecd53ba21e5713e 100644 (file)
--- a/SOGo/UI/Mailer/ChangeLog
+++ b/SOGo/UI/Mailer/ChangeLog
@@ -1,5 +1,12 @@
 2004-10-03  Helge Hess  <helge.hess@opengroupware.org>
 
+       * v0.9.12
+
+       * UIxMailListView.m: fetch size for list
+
+       * UIxMailView.m: cache fetched message for transaction, fetch body
+         structure
+
        * work on viewer (v0.9.11)
 
        * UIxMailMainFrame.wox: made toolbar floating (v0.9.10)

diff --git a/SOGo/UI/Mailer/UIxMailListView.m b/SOGo/UI/Mailer/UIxMailListView.m
index f048f55a45b4eb516437fdc435bedc75a8efba2c..9e48347b9d3bbaf12e396159aaa3da46fd8b78bf 100644 (file)
--- a/SOGo/UI/Mailer/UIxMailListView.m
+++ b/SOGo/UI/Mailer/UIxMailListView.m
@@ -85,8 +85,10 @@
 - (NSArray *)fetchKeys {
   /* Note: see SOGoMailManager.m for allowed IMAP4 keys */
   static NSArray *keys = nil;
-  if (keys == nil) 
-    keys = [[NSArray alloc] initWithObjects:@"FLAGS", @"ENVELOPE", nil];
+  if (keys == nil) {
+    keys = [[NSArray alloc] initWithObjects:
+                             @"FLAGS", @"ENVELOPE", @"RFC822.SIZE", nil];
+  }
   return keys;
 }
 

diff --git a/SOGo/UI/Mailer/UIxMailView.m b/SOGo/UI/Mailer/UIxMailView.m
index 490ccc33728c504e4d0c7424a1c375dc64452801..7276bbf6bd4b83a788e0f338a67b7656c1fdcd5a 100644 (file)
--- a/SOGo/UI/Mailer/UIxMailView.m
+++ b/SOGo/UI/Mailer/UIxMailView.m
@@ -54,8 +54,11 @@
 - (NSArray *)fetchKeys {
   /* Note: see SOGoMailManager.m for allowed IMAP4 keys */
   static NSArray *keys = nil;
-  if (keys == nil) 
-    keys = [[NSArray alloc] initWithObjects:@"FLAGS", @"ENVELOPE", nil];
+  if (keys == nil) {
+    /* Note: "BODY" actually returns the structure! */
+    keys = [[NSArray alloc] initWithObjects:
+                             @"FLAGS", @"ENVELOPE", @"BODY", nil];
+  }
   return keys;
 }
 
@@ -66,10 +69,13 @@
     return [self->message isNotNull] ? self->message : nil;
   
   msgs = [[self clientObject] fetchParts:[self fetchKeys]]; // returns dict
+  // [self logWithFormat:@"M: %@", msgs];
   msgs = [msgs valueForKey:@"fetch"];
   if ([msgs count] == 0)
     return nil;
-  return [msgs objectAtIndex:0];
+  
+  self->message = [[msgs objectAtIndex:0] retain];
+  return self->message;
 }
 
 /* derived accessors */

diff --git a/SOGo/UI/Mailer/UIxMailView.wox b/SOGo/UI/Mailer/UIxMailView.wox
index 203425983af25f38dfeab7b48df5bcbe161bf227..6e0e2f779fc6de58d4a191a83cdb762db4aaeb7a 100644 (file)
--- a/SOGo/UI/Mailer/UIxMailView.wox
+++ b/SOGo/UI/Mailer/UIxMailView.wox
@@ -69,9 +69,8 @@
 <!--
     <pre><var:string value="message" /></pre><br />
 -->
-    <img rsrc:src="tbird_073_viewer.png" />
+    <pre><var:string value="message.body" /></pre><br />
+
+    <a rsrc:href="tbird_073_viewer.png">screenshot</a>
   </div>
-<!--
-  <a rsrc:href="tbird_073_viewer.png">screenshot</a>
--->
 </var:component>

diff --git a/SOGo/UI/Mailer/Version b/SOGo/UI/Mailer/Version
index c351558f441a4d159527ee99c46d76a467ff4349..9cef79939ea704d51f0e6725b9964991d0cafe31 100644 (file)
--- a/SOGo/UI/Mailer/Version
+++ b/SOGo/UI/Mailer/Version
@@ -1,3 +1,3 @@
 # $Id$
 
-SUBMINOR_VERSION:=11
+SUBMINOR_VERSION:=12