Monotone-Parent: 1979e3cba1625ad972044ea67711850014bd8156

Monotone-Revision: 7cc314736d305ee7778315690bd8d1f0c506bef8

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2009-03-20T21:37:07
Monotone-Branch: ca.inverse.sogo

ChangeLog

@@ -1,5 +1,9 @@
 2009-03-20  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* UI/Contacts/UIxContactFoldersView.m ([UIxContactFoldersView
+	-allContactSearchAction]): trap @"SOGoDBException" and return nil
+	in that case.
+
 	* SoObjects/SOGo/SOGoUserDefaults.m ([SOGoUserDefaults
 	-jsonRepresentation]): return "{}" if values is nil (due to a DB
 	connection error).

SoObjects/SOGo/SOGoParentFolder.m

@@ -423,7 +423,13 @@ static SoSecurityManager *sm = nil;
     {
       error = [self initSubFolders];
       if (error)
-	[error raise];
+	{
+	  /* We exceptionnally raise the exception here because doPROPFIND:
+	     will not care for errors in its response from
+	     toManyRelationShipKeys, which may in turn trigger the
+	     disappearance of user folders in the SOGo extensions. */
+	  [error raise];
+	}
     }
 //   if (!!hasSubscribedSources)
 //     [self _appendSubscribedSourcesIfNeeded];

UI/Contacts/UIxContactFoldersView.m

@@ -202,7 +202,17 @@ withSearchOn: (NSString *) contact
   if ([searchText length] > 0)
     {
       //NSLog(@"Search all contacts: %@", searchText);
-      folders = [[self clientObject] subFolders];
+      NS_DURING
+	folders = [[self clientObject] subFolders];
+      NS_HANDLER
+	/* We need to specifically test for @"SOGoDBException", which is
+	   raised explicitly in SOGoParentFolder. Any other exception should
+	   be re-raised. */
+	if ([[localException name] isEqualToString: @"SOGoDBException"])
+	  folders = nil;
+	else
+	  [localException raise];
+      NS_ENDHANDLER
       sortedFolders = [NSMutableArray arrayWithCapacity: [folders count]];
       uniqueContacts = [NSMutableDictionary dictionary];
       /* We first search in LDAP folders (in case of duplicated entries in GCS folders) */