improved message lookup

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

diff --git a/SOGo/SoObjects/Mailer/ChangeLog b/SOGo/SoObjects/Mailer/ChangeLog
index 36ed42f0442caf4f40f8f4040e6baff567bd8898..ea47f5e52fa3b487edcd20b57775fb96c791b709 100644 (file)
--- a/SOGo/SoObjects/Mailer/ChangeLog
+++ b/SOGo/SoObjects/Mailer/ChangeLog
@@ -1,3 +1,8 @@
+2005-02-13  Helge Hess  <helge.hess@opengroupware.org>
+
+       * SOGoMailFolder.m: do not fetch message ids on folder traversal
+         (v0.9.72)
+
 2005-02-09  Helge Hess  <helge.hess@opengroupware.org>
 
        * v0.9.71

diff --git a/SOGo/SoObjects/Mailer/SOGoMailFolder.m b/SOGo/SoObjects/Mailer/SOGoMailFolder.m
index 2e5591252bc687558ba262caf35f7f8f21eec006..83b69dcbf1d07add3251cf807c2df217e45702c3 100644 (file)
--- a/SOGo/SoObjects/Mailer/SOGoMailFolder.m
+++ b/SOGo/SoObjects/Mailer/SOGoMailFolder.m
@@ -51,7 +51,7 @@
   
   if (self->filenames != nil)
     return [self->filenames isNotNull] ? self->filenames : nil;
-  
+
   uids = [self fetchUIDsMatchingQualifier:nil sortOrdering:@"DATE"];
   if ([uids isKindOfClass:[NSException class]])
     return nil;
@@ -138,13 +138,19 @@
 - (id)lookupName:(NSString *)_key inContext:(id)_ctx acquire:(BOOL)_flag {
   id obj;
   
-  /* first check attributes directly bound to the application */
-  if ((obj = [super lookupName:_key inContext:_ctx acquire:NO]) != nil)
+  if ([self isMessageKey:_key inContext:_ctx])
+    /* 
+       We assume here that _key is a number and methods are not and this is
+       moved above the super lookup since the super checks the
+       -toOneRelationshipKeys which in turn loads the message ids.
+    */
+    return [self lookupImap4Message:_key inContext:_ctx];
+  
+  /* check attributes directly bound to the app */
+  if ((obj = [super lookupName:_key inContext:_ctx acquire:NO]))
     return obj;
   
-  obj = [self isMessageKey:_key inContext:_ctx]
-    ? [self lookupImap4Message:_key inContext:_ctx]
-    : [self lookupImap4Folder:_key  inContext:_ctx];
+  obj = [self lookupImap4Folder:_key  inContext:_ctx];
   if (obj != nil)
     return obj;
   

diff --git a/SOGo/SoObjects/Mailer/Version b/SOGo/SoObjects/Mailer/Version
index f6d238fcbd0cfa5158dd5a4f9aaa3bc625bd5e21..19379aaccbbaf5c9ae937c375f01e28934bda925 100644 (file)
--- a/SOGo/SoObjects/Mailer/Version
+++ b/SOGo/SoObjects/Mailer/Version
@@ -1,6 +1,6 @@
 # Version file
 
-SUBMINOR_VERSION:=71
+SUBMINOR_VERSION:=72
 
 # v0.9.69 requires libNGMime       v4.5.210
 # v0.9.55 requires libNGExtensions v4.5.136