Add changed_hash, change list and complete bool

2000-11-09  JP Rosevear  <jpr@helixcode.com>

	* conduit/address-conduit.h: Add changed_hash, change list and complete bool

	* conduit/address-conduit.c (local_record_from_ecard): Add empty field checks
	(card_added): callback for book view
	(card_changed): ditto
	(card_removed): ditto
	(sequence_complete): ditto
	(view_cb): callback for the get changes call
	(pre_sync): force synchronous loading of book view
	(for_each): we already have the card so create the local record directly
	(for_each_modified): Uncomment and fix
	(delete_record): ditto

	* conduit/Makefile.am: link against gal for ebook - needs fixing

	* backend/ebook/e-book.c (e_book_do_response_get_changes): Properly respond
	to a get_changes call
	(e_book_check_listener_queue): define the get changes response operation

	* backend/ebook/e-book-listener.c (e_book_listener_queue_get_changes_response):
	Queue up a get changes response
	(impl_BookListener_respond_get_changes): Implement the get_changes method
	(e_book_listener_get_epv): add get_changes implementation to epv

	* backend/pas/pas-backend-file.c (pas_backend_file_book_view_copy): Only
	copy the search_context and change_context elements if they actually exist
	(pas_backend_file_changes): Hard code a path for now, only notify if
	there is something to notify about

svn path=/trunk/; revision=6524

4 files changed, 122 insertions, 18 deletions

diff --git a/addressbook/backend/ebook/e-book-listener.c b/addressbook/backend/ebook/e-book-listener.c
index 5efdaa37df..fb96329825 100644
--- a/addressbook/backend/ebook/e-book-listener.c
+++ b/addressbook/backend/ebook/e-book-listener.c
@@ -158,6 +158,22 @@ e_book_listener_queue_get_view_response (EBookListener        *listener,
 }
 
 static void
+e_book_listener_queue_get_changes_response (EBookListener        *listener,
+					    EBookStatus           status,
+					    Evolution_BookView    book_view)
+{
+	EBookListenerResponse *resp;
+	
+	resp = g_new0 (EBookListenerResponse, 1);
+
+	resp->op        = GetChangesResponse;
+	resp->status    = status;
+	resp->book_view = book_view;
+	
+	e_book_listener_queue_response (listener, resp);
+}
+
+static void
 e_book_listener_queue_link_status (EBookListener *listener,
 				   gboolean       connected)
 {
@@ -254,6 +270,28 @@ impl_BookListener_respond_get_view (PortableServer_Servant servant,
 }
 
 static void
+impl_BookListener_respond_get_changes (PortableServer_Servant servant,
+				       const Evolution_BookListener_CallStatus status,
+				       const Evolution_BookView book_view,
+				       CORBA_Environment *ev)
+{
+	EBookListener        *listener = E_BOOK_LISTENER (bonobo_object_from_servant (servant));
+	Evolution_BookView    book_view_copy;
+
+	book_view_copy = CORBA_Object_duplicate (book_view, ev);
+
+	if (ev->_major != CORBA_NO_EXCEPTION) {
+		g_warning ("EBookListener: Exception while duplicating BookView.\n");
+		return;
+	}
+
+	e_book_listener_queue_get_changes_response (
+		listener,
+		e_book_listener_convert_status (status),
+		book_view_copy);
+}
+
+static void
 impl_BookListener_respond_open_book (PortableServer_Servant servant,
 				     const Evolution_BookListener_CallStatus status,
 				     const Evolution_Book book,
@@ -525,6 +563,7 @@ e_book_listener_get_epv (void)
 
 	epv->respond_get_cursor        = impl_BookListener_respond_get_cursor;
 	epv->respond_get_view          = impl_BookListener_respond_get_view;
+	epv->respond_get_changes       = impl_BookListener_respond_get_changes;
 
 	epv->report_connection_status  = impl_BookListener_report_connection_status;
 
diff --git a/addressbook/backend/ebook/e-book-listener.h b/addressbook/backend/ebook/e-book-listener.h
index eb0432e360..3e4a160d33 100644
--- a/addressbook/backend/ebook/e-book-listener.h
+++ b/addressbook/backend/ebook/e-book-listener.h
@@ -45,6 +45,7 @@ typedef enum {
 	ModifyCardResponse,
 	GetCursorResponse,
 	GetBookViewResponse,
+	GetChangesResponse,
 
 	/* Async events */
 	LinkStatusEvent,
diff --git a/addressbook/backend/ebook/e-book.c b/addressbook/backend/ebook/e-book.c
index 32103fc9df..ce130a5888 100644
--- a/addressbook/backend/ebook/e-book.c
+++ b/addressbook/backend/ebook/e-book.c
@@ -187,6 +187,8 @@ e_book_do_response_get_cursor (EBook                 *book,
 	g_free (op);
 }
 
+
+
 static void
 e_book_do_response_get_view (EBook                 *book,
 			     EBookListenerResponse *resp)
@@ -238,6 +240,56 @@ e_book_do_response_get_view (EBook                 *book,
 }
 
 static void
+e_book_do_response_get_changes (EBook                 *book,
+				EBookListenerResponse *resp)
+{
+	CORBA_Environment ev;
+	EBookOp *op;
+	EBookView *book_view;
+
+	op = e_book_pop_op (book);
+
+	if (op == NULL) {
+		g_warning ("e_book_do_response_get_changes: Cannot find operation "
+			   "in local op queue!\n");
+		return;
+	}
+
+	book_view = e_book_view_new(resp->book_view, op->listener);
+	
+	if (op->cb)
+		((EBookBookViewCallback) op->cb) (book, resp->status, book_view, op->closure);
+
+	/*
+	 * Release the remote Evolution_Book in the PAS.
+	 */
+	CORBA_exception_init (&ev);
+
+	Bonobo_Unknown_unref  (resp->book_view, &ev);
+
+	if (ev._major != CORBA_NO_EXCEPTION) {
+		g_warning ("e_book_do_response_get_changs: Exception unref'ing "
+			   "remote Evolution_BookView interface!\n");
+		CORBA_exception_free (&ev);
+		CORBA_exception_init (&ev);
+	}
+	
+	CORBA_Object_release (resp->book_view, &ev);
+
+	if (ev._major != CORBA_NO_EXCEPTION) {
+		g_warning ("e_book_do_response_get_changes: Exception releasing "
+			   "remote Evolution_BookView interface!\n");
+	}
+
+	CORBA_exception_free (&ev);
+
+	gtk_object_unref(GTK_OBJECT(book_view));
+	bonobo_object_unref(BONOBO_OBJECT(op->listener));
+	
+	g_free (op);
+}
+
+static void
 e_book_do_response_open (EBook                 *book,
 			 EBookListenerResponse *resp)
 {
@@ -307,6 +359,9 @@ e_book_check_listener_queue (EBookListener *listener, EBook *book)
 	case GetBookViewResponse:
 		e_book_do_response_get_view(book, resp);
 		break;
+	case GetChangesResponse:
+		e_book_do_response_get_changes(book, resp);
+		break;
 	case OpenBookResponse:
 		e_book_do_response_open (book, resp);
 		break;
diff --git a/addressbook/backend/pas/pas-backend-file.c b/addressbook/backend/pas/pas-backend-file.c
index d90c33c76a..ce4ada1bc2 100644
--- a/addressbook/backend/pas/pas-backend-file.c
+++ b/addressbook/backend/pas/pas-backend-file.c
@@ -90,16 +90,23 @@ pas_backend_file_book_view_copy(const PASBackendFileBookView *book_view, void *c
 	new_book_view->search_sexp = book_view->search_sexp;
 	if (new_book_view->search_sexp)
 		gtk_object_ref(GTK_OBJECT(new_book_view->search_sexp));
-	new_book_view->search_context = g_new(PASBackendFileSearchContext, 1);
-	new_book_view->search_context->card = book_view->search_context->card;
-
+	if (book_view->search_context) {		
+		new_book_view->search_context = g_new(PASBackendFileSearchContext, 1);
+		new_book_view->search_context->card = book_view->search_context->card;
+	}
+	
 	new_book_view->change_id = g_strdup(book_view->change_id);
-	new_book_view->change_context = g_new(PASBackendFileChangeContext, 1);
-	new_book_view->change_context->db = book_view->change_context->db;
-	new_book_view->change_context->add_cards = book_view->change_context->add_cards;
-	new_book_view->change_context->mod_cards = book_view->change_context->mod_cards;
-	new_book_view->change_context->del_cards = book_view->change_context->del_cards;
-
+	if (book_view->change_context) {
+		new_book_view->change_context = g_new(PASBackendFileChangeContext, 1);
+		new_book_view->change_context->db = book_view->change_context->db;
+		new_book_view->change_context->add_cards = book_view->change_context->add_cards;
+		new_book_view->change_context->add_ids = book_view->change_context->add_ids;
+		new_book_view->change_context->mod_cards = book_view->change_context->mod_cards;
+		new_book_view->change_context->mod_ids = book_view->change_context->mod_ids;
+		new_book_view->change_context->del_cards = book_view->change_context->del_cards;
+		new_book_view->change_context->del_ids = book_view->change_context->del_ids;
+	}
+	
 	return new_book_view;
 }
 
@@ -548,9 +555,8 @@ pas_backend_file_changes (PASBackendFile  	      *bf,
 	if (!bf->priv->loaded)
 		return;
 
-	/* Find the changed ids */
-	filename = g_strdup ("test");
-	
+	/* Find the changed ids - FIX ME, patch should not be hard coded */
+	filename = g_strdup_printf ("%s/evolution/local/Contacts/%s.db", g_get_home_dir (), view->change_id);
 	ehash = e_dbhash_new (filename);
 	g_free (filename);
 	
@@ -582,7 +588,7 @@ pas_backend_file_changes (PASBackendFile  	      *bf,
 		db_error = db->seq(db, &id_dbt, &vcard_dbt, R_NEXT);
 	}
 
-	e_dbhash_foreach_key (ehash, (EDbHashFunc *)pas_backend_file_changes_foreach_key, view->change_context);
+   	e_dbhash_foreach_key (ehash, (EDbHashFunc)pas_backend_file_changes_foreach_key, view->change_context);
 
 	/* Update the hash */
 	for (i = ctx->add_ids, v = ctx->add_cards; i != NULL; i = i->next, v = v->next){
@@ -600,15 +606,18 @@ pas_backend_file_changes (PASBackendFile  	      *bf,
 		e_dbhash_remove (ehash, id);
 	}	
 
-	e_dbhash_write (ehash);
-	e_dbhash_destroy (ehash);
+  	e_dbhash_write (ehash);
+  	e_dbhash_destroy (ehash);
 
 	/* Send the changes */
 	if (db_error == -1) {
 		g_warning ("pas_backend_file_changes: error building list\n");
 	} else {
-		pas_book_view_notify_add (view->book_view, ctx->add_cards);
-		pas_book_view_notify_change (view->book_view, ctx->mod_cards);
+  		if (ctx->add_cards != NULL)
+  			pas_book_view_notify_add (view->book_view, ctx->add_cards);
+		
+		if (ctx->mod_cards != NULL)
+			pas_book_view_notify_change (view->book_view, ctx->mod_cards);
 
 		for (v = ctx->del_cards; v != NULL; v = v->next){
 			char *vcard = v->data;
@@ -1037,7 +1046,7 @@ pas_backend_file_process_get_changes (PASBackend *backend,
 	view.book_view = book_view;
 	view.change_id = req->change_id;
 	view.change_context = &ctx;
-	ctx.db = NULL;
+	ctx.db = bf->priv->file_db;
 	ctx.add_cards = NULL;
 	ctx.add_ids = NULL;
 	ctx.mod_cards = NULL;