Changeset 1764

Timestamp:

02/19/07 17:47:07 (22 months ago)

Author:

dgollub

Message:

Fixed build of kdepim-sync for new API.
Not tested... it is not going to be useable!

Location:

plugins/kdepim/src

Files:

• kaddrbook.cpp (modified) (10 diffs)
• kaddrbook.h (modified) (1 diff)
• kdepim_impl.cpp (modified) (6 diffs)
• osyncbase.h (modified) (1 diff)

plugins/kdepim/src/kaddrbook.cpp

@@ -31 +31 @@
 #include <qdeepcopy.h>
 
-KContactDataSource::KContactDataSource(OSyncMember *member, OSyncHashTable *hashtable) : hashtable(hashtable), member(member)
+KContactDataSource::KContactDataSource(OSyncHashTable *hashtable) : hashtable(hashtable)
 {
         connected = false;
@@ -55 +55 @@
 }
 
-bool KContactDataSource::connect(OSyncContext *ctx)
-{
-        osync_trace(TRACE_ENTRY, "%s(%p)", __func__, ctx);
+bool KContactDataSource::connect(OSyncPluginInfo *info, OSyncContext *ctx)
+{
+        osync_trace(TRACE_ENTRY, "%s(%p, %p)", __func__, info, ctx);
 
         DCOPClient *dcopc = KApplication::kApplication()->dcopClient();
@@ -79 +79 @@
         addressbookptr = KABC::StdAddressBook::self();
 
+        OSyncObjTypeSink *sink = osync_plugin_info_get_sink(info);
+
         //Detection mechanismn if this is the first sync
-        if (!osync_anchor_compare(member, "contact", "true")) {
+        QString anchorpath = QString("%1/anchor.db").arg(osync_plugin_info_get_configdir(info));
+        if (!osync_anchor_compare(anchorpath, "contact", "true")) {
                 osync_trace(TRACE_INTERNAL, "Setting slow-sync contact");
-                osync_member_set_slow_sync(member, "contact", TRUE);
+                osync_objtype_sink_set_slowsync(sink, TRUE);
         }
 
@@ -90 +93 @@
 }
 
-bool KContactDataSource::disconnect(OSyncContext *ctx)
-{
-        osync_trace(TRACE_ENTRY, "%s(%p)", __func__, ctx);
+bool KContactDataSource::disconnect(OSyncPluginInfo *info, OSyncContext *ctx)
+{
+        osync_trace(TRACE_ENTRY, "%s(%p, %p)", __func__, info, ctx);
 
         KABC::Ticket *ticket = addressbookptr->requestSaveTicket();
@@ -113 +116 @@
 
 
-bool KContactDataSource::contact_get_changeinfo(OSyncContext *ctx)
-{
-        osync_trace(TRACE_ENTRY, "%s(%p)", __func__, ctx);
-
-        if (osync_member_get_slow_sync(member, "contact")) {
+bool KContactDataSource::contact_get_changeinfo(OSyncPluginInfo *info, OSyncContext *ctx)
+{
+        osync_trace(TRACE_ENTRY, "%s(%p, %p)", __func__, info, ctx);
+
+        OSyncError *error = NULL;
+        OSyncObjTypeSink *sink = osync_plugin_info_get_sink(info);
+
+        if (osync_objtype_sink_get_slowsync(sink)) {
                 osync_trace(TRACE_INTERNAL, "Got slow-sync");
-                osync_hashtable_set_slow_sync(hashtable, "contact");
+                osync_hashtable_reset(hashtable);
         }
 
@@ -129 +135 @@
         }
 
+        OSyncFormatEnv *formatenv = osync_plugin_info_get_format_env(info);
+        OSyncObjFormat *objformat = osync_format_env_find_objformat(formatenv, "vcard30");
+
         KABC::VCardConverter converter;
         for (KABC::AddressBook::Iterator it=addressbookptr->begin(); it!=addressbookptr->end(); it++ ) {
                 QString uid = it->uid();
 
-                OSyncChange *chg = osync_change_new();
-
-                osync_change_set_member(chg, member);
-                osync_change_set_uid(chg, uid.local8Bit());
+                OSyncChange *change = osync_change_new(&error);
+
+                osync_change_set_uid(change, uid.local8Bit());
 
                 QString hash = calc_hash(*it);
@@ -148 +156 @@
                 osync_trace(TRACE_SENSITIVE,"\n%s", data);
 
-                osync_change_set_data(chg, data, strlen(data) + 1, TRUE);
-
-                // object type and format
-                osync_change_set_objtype_string(chg, "contact");
-                osync_change_set_objformat_string(chg, "vcard30");
+                OSyncData *odata = osync_data_new(data, strlen(data), objformat, &error);
+                if (!odata) {
+                        osync_change_unref(change);
+                        osync_context_report_osyncwarning(ctx, error);
+                        osync_error_unref(&error);
+                        continue;
+                }
+
+                osync_data_set_objtype(odata, osync_objtype_sink_get_name(sink));
+
+                //Now you can set the data for the object
+                osync_change_set_data(change, odata);
+                osync_data_unref(odata);
 
                 // Use the hash table to check if the object
                 // needs to be reported
-                osync_change_set_hash(chg, hash.data());
-                if (osync_hashtable_detect_change(hashtable, chg)) {
-                        osync_context_report_change(ctx, chg);
-                        osync_hashtable_update_hash(hashtable, chg);
-                }
-        }
-
-        // Use the hashtable to report deletions
-        osync_hashtable_report_deleted(hashtable, ctx, "contact");
+                osync_change_set_hash(change, hash.data());
+                OSyncChangeType changetype = osync_hashtable_get_changetype(hashtable, uid.local8Bit(), hash.data());
+                if (OSYNC_CHANGE_TYPE_UNMODIFIED != changetype) {
+                        osync_context_report_change(ctx, change);
+                        osync_hashtable_update_hash(hashtable, changetype, uid, hash.data());
+                }
+        }
+
+        int i;
+        char **uids = osync_hashtable_get_deleted(hashtable);
+        for (i=0; uids[i]; i++) {
+                OSyncChange *change = osync_change_new(&error);
+                if (!change) {
+                        g_free(uids[i]);
+                        osync_context_report_osyncwarning(ctx, error);
+                        osync_error_unref(&error);
+                        continue;
+                }
+
+                osync_change_set_uid(change, uids[i]);
+                osync_change_set_changetype(change, OSYNC_CHANGE_TYPE_DELETED);
+
+                OSyncData *odata = osync_data_new(NULL, 0, objformat, &error);
+                if (!odata) {
+                        g_free(uids[i]);
+                        osync_change_unref(change);
+                        osync_context_report_osyncwarning(ctx, error);
+                        osync_error_unref(&error);
+                        continue;
+                }
+
+                osync_data_set_objtype(odata, osync_objtype_sink_get_name(sink));
+                osync_change_set_data(change, odata);
+                osync_data_unref(odata);
+
+                osync_context_report_change(ctx, change);
+
+                osync_hashtable_update_hash(hashtable, osync_change_get_changetype(change), osync_change_get_uid(change), NULL);
+
+                osync_change_unref(change);
+                g_free(uids[i]);
+        }
+        g_free(uids);
 
         osync_trace(TRACE_EXIT, "%s", __func__);
@@ -183 +233 @@
 
         // convert VCARD string from obj->comp into an Addresse object.
-        char *data = osync_change_get_data(chg);
-        size_t data_size = osync_change_get_datasize(chg);
+        OSyncData *odata = osync_change_get_data(chg);
+
+        char *data;
+        size_t data_size; 
+
+        osync_data_get_data(odata, &data, &data_size);
+
         QString uid = osync_change_get_uid(chg);
 
@@ -248 +303 @@
 }
 
-bool KContactDataSource::vcard_access(OSyncContext *ctx, OSyncChange *chg)
+bool KContactDataSource::vcard_access(OSyncPluginInfo *info, OSyncContext *ctx, OSyncChange *chg)
 {
         if (!__vcard_access(ctx, chg))
@@ -257 +312 @@
 }
 
-bool KContactDataSource::vcard_commit_change(OSyncContext *ctx, OSyncChange *chg)
+bool KContactDataSource::vcard_commit_change(OSyncPluginInfo *info, OSyncContext *ctx, OSyncChange *chg)
 {
         if ( !__vcard_access(ctx, chg) )
                 return false;
 
-        osync_hashtable_update_hash(hashtable, chg);
         osync_context_report_success(ctx);
         return true;

plugins/kdepim/src/kaddrbook.h

@@ -34 +34 @@
         private:
                 KABC::AddressBook* addressbookptr;
-
                 OSyncHashTable *hashtable;
-                OSyncMember *member;
 
                 bool __vcard_access(OSyncContext *ctx, OSyncChange *chg);
 
+
         public:
-                KContactDataSource(OSyncMember *member, OSyncHashTable *hashtable);
+                KContactDataSource(OSyncHashTable *hashtable);
 
                 QString calc_hash(KABC::Addressee &e);
-                bool connect(OSyncContext *ctx);
-                bool disconnect(OSyncContext *ctx);
-                bool contact_get_changeinfo(OSyncContext *ctx);
-                bool vcard_access(OSyncContext *ctx, OSyncChange *chg);
-                bool vcard_commit_change(OSyncContext *ctx, OSyncChange *chg);
+                bool connect(OSyncPluginInfo *info, OSyncContext *ctx);
+                bool disconnect(OSyncPluginInfo *info, OSyncContext *ctx);
+                bool contact_get_changeinfo(OSyncPluginInfo *info, OSyncContext *ctx);
+                bool vcard_access(OSyncPluginInfo *info, OSyncContext *ctx, OSyncChange *chg);
+                bool vcard_commit_change(OSyncPluginInfo *info, OSyncContext *ctx, OSyncChange *chg);
                 bool connected;
 };

plugins/kdepim/src/kdepim_impl.cpp

@@ -93 +93 @@
                         mHashtable = osync_hashtable_new(tablepath, osync_objtype_sink_get_name(sink), error);
 
-                        mKaddrbook = new KContactDataSource(mMember, mHashtable);
+                        mKaddrbook = new KContactDataSource(mHashtable);
 
                         osync_trace(TRACE_EXIT, "%s", __func__);
@@ -110 +110 @@
                 }
 
-                virtual void connect(OSyncPluginInfo * /*info*/, OSyncContext *ctx)
+                virtual void connect(OSyncPluginInfo *info, OSyncContext *ctx)
                 {
                         osync_trace(TRACE_ENTRY, "%s(%p)", __func__, ctx);
@@ -117 +117 @@
 
                         if (mKaddrbook && \
-                                !mKaddrbook->connect(ctx)) {
+                                !mKaddrbook->connect(info, ctx)) {
                                 osync_trace(TRACE_EXIT_ERROR, "%s: Unable to open addressbook", __func__);
                                 return;
@@ -126 +126 @@
                 }
 
-                virtual void disconnect(OSyncPluginInfo * /*info*/, OSyncContext *ctx)
+                virtual void disconnect(OSyncPluginInfo *info, OSyncContext *ctx)
                 {
-                        if (mKaddrbook && mKaddrbook->connected && !mKaddrbook->disconnect(ctx))
+                        if (mKaddrbook && mKaddrbook->connected && !mKaddrbook->disconnect(info, ctx))
                                 return;
 
@@ -145 +145 @@
                 }
 
-                virtual void get_changeinfo(OSyncPluginInfo * /*info*/, OSyncContext *ctx)
+                virtual void get_changeinfo(OSyncPluginInfo *info, OSyncContext *ctx)
                 {
-                        if (mKaddrbook && mKaddrbook->connected && !mKaddrbook->contact_get_changeinfo(ctx))
+                        if (mKaddrbook && mKaddrbook->connected && !mKaddrbook->contact_get_changeinfo(info, ctx))
                                 return;
                         osync_context_report_success(ctx);
                 }
 
-                virtual bool vcard_access(OSyncPluginInfo * /*info*/, OSyncContext *ctx, OSyncChange *chg)
+                virtual bool vcard_access(OSyncPluginInfo *info, OSyncContext *ctx, OSyncChange *chg)
                 {
                         if (mKaddrbook)
-                                return mKaddrbook->vcard_access(ctx, chg);
+                                return mKaddrbook->vcard_access(info, ctx, chg);
                         else {
                                 osync_context_report_error(ctx, OSYNC_ERROR_NOT_SUPPORTED, "No addressbook loaded");
@@ -163 +163 @@
                 }
 
-                virtual bool vcard_commit_change(OSyncPluginInfo * /*info*/, OSyncContext *ctx, OSyncChange *chg)
+                virtual bool vcard_commit_change(OSyncPluginInfo *info, OSyncContext *ctx, OSyncChange *chg)
                 {
                         if (mKaddrbook)
-                                return mKaddrbook->vcard_commit_change(ctx, chg);
+                                return mKaddrbook->vcard_commit_change(info, ctx, chg);
                         else {
                                 osync_context_report_error(ctx, OSYNC_ERROR_NOT_SUPPORTED, "No addressbook loaded");

plugins/kdepim/src/osyncbase.h

@@ -9 +9 @@
 #include <opensync/opensync-data.h>
 #include <opensync/opensync-helper.h>
+#include <opensync/opensync-format.h>   
 }