Merge lp:~rodrigo-moya/evolution-couchdb/application-annotations-support into lp:evolution-couchdb

[Rodrigo Moya]

[Rodrigo Moya (rodrigo-moya)]

Depend on couchdb-glib >= 0.4.4
Add support for application_annotations field

[Eric Casteleijn (thisfred)]

Code looks like it's doing the right things, but then my C sucks... :)

review: Approve

[Elliot Murphy (statik)]

review: Approve

=== modified file 'addressbook/e-book-backend-couchdb.c'
--- addressbook/e-book-backend-couchdb.c	2009-08-17 22:30:09 +0000
+++ addressbook/e-book-backend-couchdb.c	2009-08-19 11:38:13 +0000
@@ -25,8 +25,9 @@
 #include <libedata-book/e-data-book-view.h>
 #include <dbus/dbus-glib.h>
 
-#define COUCHDB_REVISION_PROP "X-COUCHDB-REVISION"
-#define COUCHDB_UUID_PROP     "X-COUCHDB-UUID"
+#define COUCHDB_REVISION_PROP                "X-COUCHDB-REVISION"
+#define COUCHDB_UUID_PROP                    "X-COUCHDB-UUID"
+#define COUCHDB_APPLICATION_ANNOTATIONS_PROP "X-COUCHDB-APPLICATION-ANNOTATIONS"
 
 G_DEFINE_TYPE (EBookBackendCouchDB, e_book_backend_couchdb, E_TYPE_BOOK_BACKEND);
 
@@ -258,6 +259,19 @@
 		}
 	}
 
+	/* application annotations */
+	if (couchdb_document_has_field (document, "application_annotations")) {
+		CouchDBStructField *annotations = couchdb_document_get_application_annotations (document);
+
+		str = couchdb_struct_field_to_string (annotations);
+		e_vcard_add_attribute_with_value (E_VCARD (contact),
+						  e_vcard_attribute_new (NULL, COUCHDB_APPLICATION_ANNOTATIONS_PROP),
+						  str);
+
+		g_free (str);
+		couchdb_struct_field_unref (annotations);
+	}
+
 	/* convert the contact to a VCARD string to be returned */
 	str = e_vcard_to_string (E_VCARD (contact), EVC_FORMAT_VCARD_30);
 
@@ -389,7 +403,7 @@
 	const EContactAddress *contact_address;
 
 	/* create the CouchDBDocument to put on the database */
-	document = couchdb_document_new (couchdb_backend->couchdb);
+	document = couchdb_document_contact_new (couchdb_backend->couchdb);
 
 	str = e_contact_get_const (contact, E_CONTACT_UID);
 	if (str)
@@ -505,6 +519,18 @@
 		g_free (dt_str);
 	}
 
+	/* application annotations */
+	str = e_vcard_attribute_get_value (e_vcard_get_attribute (E_VCARD (contact), COUCHDB_APPLICATION_ANNOTATIONS_PROP));
+	if (str) {
+		CouchDBStructField *annotations;
+
+		annotations = couchdb_struct_field_new_from_string (str);
+		if (annotations) {
+			couchdb_document_set_application_annotations (document, annotations);
+			couchdb_struct_field_unref (annotations);
+		}
+	}
+
 	return document;
 }
 

=== modified file 'configure.ac'
--- configure.ac	2009-08-12 08:55:48 +0000
+++ configure.ac	2009-08-19 11:38:13 +0000
@@ -34,7 +34,7 @@
 AC_SUBST(localedir)
 
 dnl Check for dependencies
-PKG_CHECK_MODULES(EVOLUTION, glib-2.0 couchdb-glib-1.0 >= 0.4.3 libebook-1.2 libedata-book-1.2 dbus-glib-1)
+PKG_CHECK_MODULES(EVOLUTION, glib-2.0 couchdb-glib-1.0 >= 0.4.4 libebook-1.2 libedata-book-1.2 dbus-glib-1)
 AC_SUBST(EVOLUTION_CFLAGS)
 AC_SUBST(EVOLUTION_LIBS)