[evolution-patches] Patch for bug #44873

[Alex Jiang <alex jiang sun com>]

Performance imporved greatly for LDAP servers without displayName indexed,
although still a distance from satisfaction.


Index: evolution/addressbook/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/ChangeLog,v
retrieving revision 1.1437
diff -u -r1.1437 ChangeLog
--- evolution/addressbook/ChangeLog	22 Jul 2003 14:38:54 -0000	1.1437
+++ evolution/addressbook/ChangeLog	24 Jul 2003 03:08:41 -0000
@@ -1,3 +1,9 @@
+2003-06-25  Alex Jiang <alex jiang sun com>
+
+	* backend/pas/pas-backend-ldap.c
+	(func_beginswith): remove "displyaName" from default options
+	in LDAP search filter. bug #44873 . 
+	
 2003-07-22  Dan Winship  <danw ximian com>
 
 	* backend/ebook/e-card.c: (e_card_new,
@@ -24,6 +30,7 @@
 	* gui/component/addressbook-component.c (new_item_cb): don't leak
 	the new card.
 
+>>>>>>> 1.1437
 2003-06-25  Gilbert Fang <gilbert fang sun com>
 
 	* gui/widgets/e-minicard-view-widget.c 
Index: evolution/addressbook/backend/pas/pas-backend-ldap.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/backend/pas/pas-backend-ldap.c,v
retrieving revision 1.131
diff -u -r1.131 pas-backend-ldap.c
--- evolution/addressbook/backend/pas/pas-backend-ldap.c	14 Jun 2003 06:05:37 -0000	1.131
+++ evolution/addressbook/backend/pas/pas-backend-ldap.c	24 Jul 2003 03:08:46 -0000
@@ -2626,6 +2626,14 @@
 					ldap_data->list = g_list_prepend(ldap_data->list,
 									 g_strdup_printf("(sn=%s*)", str));
 			}
+			else if (!strcmp (ldap_attr, "displayName")) {
+				if (ldap_data->bl->priv->evolutionPersonSupported)
+					ldap_data->list = g_list_prepend(ldap_data->list,
+									 g_strdup_printf("(displayName=%s)", str));
+				else
+					ldap_data->list = g_list_prepend(ldap_data->list,
+									 g_strdup(""));
+			}
 			else {
 				ldap_data->list = g_list_prepend(ldap_data->list,
 								 g_strdup_printf("(%s=%s*)",