[ huge change, all for 1 little performance problem :) fixes #18207 ] use

2003-02-08  Chris Toshok  <toshok@ximian.com>

	[ huge change, all for 1 little performance problem :) fixes #18207 ]
	* gui/widgets/e-addressbook-model.c (get_view): use
	e_book_check_static_capability here to make things a little
	prettier.
	(remove_card): complain about my life, and add code to use one
	"model_changed" signal if we get back a list of cards instead of
	multiple "card_removed" signals.

	* gui/widgets/e-addressbook-model.h: little clean up.

	* gui/widgets/e-addressbook-view.c (delete): write a bulk-remove
	case for this.  if the backend supports it, send all the ids at
	once.  otherwise loop over the ids.
	(e_addressbook_view_delete_selection): fake a CardAndBook
	structure and call delete, instead of duplicating the code in 2
	places.

	* gui/component/addressbook.c (delete_contact_cb): don't call
	e_contact_editor_confirm_delete here, it's handled by the
	EAddressbookView.

	* backend/pas/pas-card-cursor.c (pas_card_cursor_construct): fix a
	compiler warning about a stupid crash.

	* backend/pas/pas-book.h (PASOperation): RemoveCard ->
	RemoveCards.
	(PASRemoveCardsReques): char *id -> GList *ids.
	(PASRequest): PASRemoveCardRequest -> PASRemoveCardsRequest.

	* backend/pas/pas-book.c (pas_book_queue_remove_cards): build up a
	GList from the id sequence.
	(pas_book_respond_remove): notifyCardRemoved ->
	notifyCardsRemoved.
	(impl_GNOME_Evolution_Addressbook_Book_removeCards): rename.
	(pas_book_free_request): free the idlist for RemoveCards.
	(pas_book_class_init): removeCard -> removeCards.

	* backend/pas/pas-book-view.h: change prototype for
	pas_book_view_notify_remove, and add prototype for
	pas_book_view_notify_remove_1.

	* backend/pas/pas-book-view.c (pas_book_view_notify_remove_1):
	build up a list and call pas_book_view_notify_remove.
	(pas_book_view_notify_remove): build up the corba id sequence and
	call BookViewListener::notifyCardsRemoved.

	* backend/pas/pas-backend.h: remove_card -> remove_cards.

	* backend/pas/pas-backend.c (pas_backend_remove_cards): rename
	from _remove_card.
	(process_client_requests): RemoveCard -> RemoveCards and
	_remove_card -> _remove_cards.

	* backend/pas/pas-backend-ldap.c (check_schema_support):
	g_strcasecmp -> g_ascii_strcasecmp.
	(remove_card_handler): _remove => _remove_1.
	(modify_card_modify_handler): same.
	(pas_backend_ldap_process_remove_cards): rename from _remove_card.
	(pas_backend_ldap_class_init): _remove_card -> _remove_cards.

	* backend/pas/pas-backend-file.c (pas_backend_file_class_init):
	remove_card -> remove_cards.
	(pas_backend_file_get_static_capabilities): add "bulk-removes".
	(pas_backend_file_process_remove_cards): rewrite this function
	largely, so that it handles lists of ids.  first we loop through
	and for every successful deletion we build a list of deleted
	ECards.  Then for each view we build a list (a subset of the
	deleted ECard list) and pass back that list to the view.
	(pas_backend_file_process_modify_card): use _remove_1 instead of
	_remove.
	(ecard_matches_search): new function.

	* backend/pas/pas-backend-card-sexp.c
	(pas_backend_card_sexp_match_vcard): rewrite in terms of
	_match_ecard.
	(pas_backend_card_sexp_match_ecard): new function, the guts from
	_match_vcard.

	* backend/pas/pas-backend-card-sexp.h: add prototype for
	pas_backend_card_sexp_match_ecard.

	* backend/idl/addressbook.idl: the card removal stuff now takes
	CardIdList.

	* backend/ebook/e-book.c (e_book_get_static_capabilities): cache
	successful capability queries (since they're static).
	(e_book_check_static_capability): new, convenience function to
	check if a particular capability is supported.
	(e_book_remove_card_by_id): build a single element GList and call
	e_book_remove_cards.
	(e_book_remove_cards): build up a CORBA sequence from the GList
	and call Book::removeCards.
	(e_book_dispose): free the cached capabilities string.

	* backend/ebook/e-book.h: add new prototypes for
	e_book_check_static_capability and e_book_remove_cards.

	* backend/ebook/e-book-view.h (struct _EBookViewClass): rename
	"card_removed" signal to "cards_removed".

	* backend/ebook/e-book-view.c (e_book_view_do_removed_event): id
	-> ids, and free the id list.
	(e_book_view_check_listener_queue): CardRemovedEvent ->
	CardsRemovedEvent.

	* backend/ebook/e-book-view-listener.c
	(e_book_view_listener_queue_response): free the id list.
	(e_book_view_listener_queue_idlist_event): new function, used for
	cards_removed.
	(e_book_view_listener_queue_status_event): id -> ids.
	(e_book_view_listener_queue_sequence_event): same.
	(e_book_view_listener_queue_message_event): same.
	(impl_BookViewListener_notify_cards_removed): call
	queue_idlist_event.
	(e_book_view_listener_dispose): free the id list.
	(e_book_view_listener_class_init): track change to idl call.

	* backend/ebook/e-book-view-listener.h
	(EBookViewListenerOperation): CardRemovedEvent ->
	CardsRemovedEvent.
	(EBookViewListenerResponse): char *id -> GList *ids.

	* backend/ebook/e-book-listener.c
	(impl_BookListener_respond_r

svn path=/trunk/; revision=19854

1 files changed, 62 insertions, 35 deletions

diff --git a/addressbook/backend/pas/pas-backend-file.c b/addressbook/backend/pas/pas-backend-file.c
index 852352191d..29524eff26 100644
--- a/addressbook/backend/pas/pas-backend-file.c
+++ b/addressbook/backend/pas/pas-backend-file.c
@@ -337,6 +337,16 @@ vcard_matches_search (const PASBackendFileBookView *view, char *vcard_string)
 	return pas_backend_card_sexp_match_vcard (view->card_sexp, vcard_string);
 }
 
+static gboolean
+ecard_matches_search (const PASBackendFileBookView *view, ECard *card)
+{
+	/* If this is not a search context view, it doesn't match be default */
+	if (view->card_sexp == NULL)
+		return FALSE;
+
+	return pas_backend_card_sexp_match_ecard (view->card_sexp, card);
+}
+
 static void
 pas_backend_file_search (PASBackendFile  	      *bf,
 			 PASBook         	      *book,
@@ -552,7 +562,7 @@ pas_backend_file_changes (PASBackendFile  	      *bf,
 
 		for (v = ctx->del_ids; v != NULL; v = v->next){
 			char *id = v->data;
-			pas_book_view_notify_remove (view->book_view, id);
+			pas_book_view_notify_remove_1 (view->book_view, id);
 		}
 		
 		pas_book_view_notify_complete (view->book_view, GNOME_Evolution_Addressbook_BookViewListener_Success);
@@ -679,59 +689,76 @@ pas_backend_file_process_create_card (PASBackend *backend,
 }
 
 static void
-pas_backend_file_process_remove_card (PASBackend *backend,
-				      PASBook    *book,
-				      PASRemoveCardRequest *req)
+pas_backend_file_process_remove_cards (PASBackend *backend,
+				       PASBook    *book,
+				       PASRemoveCardsRequest *req)
 {
 	PASBackendFile *bf = PAS_BACKEND_FILE (backend);
 	DB             *db = bf->priv->file_db;
 	DBT            id_dbt, vcard_dbt;
 	int            db_error;
 	EIterator     *iterator;
-	char          *vcard_string;
 	const char    *id;
+	GList         *l;
+	GList         *removed_cards = NULL;
+	GNOME_Evolution_Addressbook_BookListener_CallStatus rv = GNOME_Evolution_Addressbook_BookListener_Success;
 
-	id = req->id;
-	string_to_dbt (id, &id_dbt);
-	memset (&vcard_dbt, 0, sizeof (vcard_dbt));
+	for (l = req->ids; l; l = l->next) {
+		id = l->data;
 
-	db_error = db->get (db, NULL, &id_dbt, &vcard_dbt, 0);
-	if (0 != db_error) {
-		pas_book_respond_remove (
-				 book,
-				 GNOME_Evolution_Addressbook_BookListener_CardNotFound);
-		return;
-	}
+		string_to_dbt (id, &id_dbt);
+		memset (&vcard_dbt, 0, sizeof (vcard_dbt));
+
+		db_error = db->get (db, NULL, &id_dbt, &vcard_dbt, 0);
+		if (0 != db_error) {
+			rv = GNOME_Evolution_Addressbook_BookListener_CardNotFound;
+			continue;
+		}
 	
-	db_error = db->del (db, NULL, &id_dbt, 0);
-	if (0 != db_error) {
-		pas_book_respond_remove (
-				 book,
-				 GNOME_Evolution_Addressbook_BookListener_CardNotFound);
-		return;
-	}
+		db_error = db->del (db, NULL, &id_dbt, 0);
+		if (0 != db_error) {
+			rv = GNOME_Evolution_Addressbook_BookListener_CardNotFound;
+			continue;
+		}
 
-	db_error = db->sync (db, 0);
-	if (db_error != 0)
-		g_warning ("db->sync failed.\n");
+		removed_cards = g_list_prepend (removed_cards, e_card_new (vcard_dbt.data));
+	}
 
+	/* if we actually removed some, try to sync */
+	if (removed_cards) {
+		db_error = db->sync (db, 0);
+		if (db_error != 0)
+			g_warning ("db->sync failed.\n");
+	}
 
-	vcard_string = vcard_dbt.data;
 	for (iterator = e_list_get_iterator (bf->priv->book_views); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
 		const PASBackendFileBookView *view = e_iterator_get(iterator);
-		if (vcard_matches_search (view, vcard_string)) {
+		GList *view_removed = NULL;
+		for (l = removed_cards; l; l = l->next) {
+			ECard *removed_card = l->data;
+			if (ecard_matches_search (view, removed_card)) {
+				view_removed = g_list_prepend (view_removed, (char*)e_card_get_id (removed_card));
+			}
+		}
+		if (view_removed) {
 			bonobo_object_ref (BONOBO_OBJECT (view->book_view));
-			pas_book_view_notify_remove (view->book_view, req->id);
+			pas_book_view_notify_remove (view->book_view, view_removed);
 			pas_book_view_notify_complete (view->book_view, GNOME_Evolution_Addressbook_BookViewListener_Success);
 			bonobo_object_unref (BONOBO_OBJECT (view->book_view));
+			g_list_free (view_removed);
 		}
 	}
 	g_object_unref(iterator);
 	
-	pas_book_respond_remove (
-				 book,
-				 GNOME_Evolution_Addressbook_BookListener_Success);
-	pas_backend_summary_remove_card (bf->priv->summary, id);
+	pas_book_respond_remove (book, rv);
+
+	for (l = removed_cards; l; l = l->next) {
+		ECard *c = l->data;
+		pas_backend_summary_remove_card (bf->priv->summary, e_card_get_id (c));
+		g_object_unref (c);
+	}
+
+	g_list_free (removed_cards);
 }
 
 static void
@@ -801,7 +828,7 @@ pas_backend_file_process_modify_card (PASBackend *backend,
 			else if (new_match)
 				pas_book_view_notify_add_1 (view->book_view, req->vcard);
 			else /* if (old_match) */
-				pas_book_view_notify_remove (view->book_view, id);
+				pas_book_view_notify_remove_1 (view->book_view, id);
 
 			pas_book_view_notify_complete (view->book_view, GNOME_Evolution_Addressbook_BookViewListener_Success);
 
@@ -1417,7 +1444,7 @@ pas_backend_file_get_uri (PASBackend *backend)
 static char *
 pas_backend_file_get_static_capabilities (PASBackend *backend)
 {
-	return g_strdup("local,do-initial-query,cache-completions");
+	return g_strdup("local,do-initial-query,bulk-removes");
 }
 
 static gboolean
@@ -1487,7 +1514,7 @@ pas_backend_file_class_init (PASBackendFileClass *klass)
 	parent_class->get_static_capabilities = pas_backend_file_get_static_capabilities;
 
 	parent_class->create_card             = pas_backend_file_process_create_card;
-	parent_class->remove_card             = pas_backend_file_process_remove_card;
+	parent_class->remove_cards            = pas_backend_file_process_remove_cards;
 	parent_class->modify_card             = pas_backend_file_process_modify_card;
 	parent_class->check_connection        = pas_backend_file_process_check_connection;
 	parent_class->get_vcard               = pas_backend_file_process_get_vcard;