Changeset 2442

Timestamp:

08/13/07 15:17:41 (1 year ago)

Author:

paule

Message:

Remove old uid mapping code and change to rely upon OpenSync?'s internal mapping logic; fix segfault when committing deletions; fix endless looping in get_changes

Files:

• plugins/opie-sync/src/opie_format.c (modified) (6 diffs)
• plugins/opie-sync/src/opie_format.h (modified) (1 diff)
• plugins/opie-sync/src/opie_sync.c (modified) (8 diffs)
• plugins/opie-sync/src/opie_sync.h (modified) (1 diff)
• plugins/opie-sync/src/opie_xml.c (modified) (2 diffs)
• plugins/opie-sync/src/opie_xml.h (modified) (1 diff)

plugins/opie-sync/src/opie_format.c

@@ -278 +278 @@
-                                        osync_xmlfield_set_key_value(out_xmlfield, "Content", iprop->children->content);
-                                }
-                                else if(!strcasecmp(iprop->name, "Uid"))
-                                {
-                                        out_xmlfield = osync_xmlfield_new(out_xmlformat, "Uid", error);
-                                        osync_xmlfield_set_key_value(out_xmlfield, "Content", iprop->children->content);
-                                }
-                                else if(!strcasecmp(iprop->name, "rid"))
-                                {
@@ -512 +507 @@
-                else if(!strcmp("FormattedName", fieldname)) {
-                        xmlfield_key_to_attr(in_xmlfield, "Content", on_contact, "FileAs");
-                }
-                else if(!strcmp("Uid", fieldname)) {
-                        xmlfield_key_to_attr(in_xmlfield, "Content", on_contact, "Uid");
-                }
-                else if(!strcmp("Categories", fieldname)) {
@@ -649 +641 @@
-                                        osync_xmlfield_set_key_value(out_xmlfield, "Content", iprop->children->content);
-                                        osync_xmlfield_set_key_value(out_xmlfield, "Value", "DATE"); /* FIXME I doubt this is still valid */
-                                }
-                                else if(!strcasecmp(iprop->name, "Uid"))
-                                {
-                                        out_xmlfield = osync_xmlfield_new(out_xmlformat, "Uid", error);
-                                        osync_xmlfield_set_key_value(out_xmlfield, "Content", iprop->children->content);
-                                }
-                                else if(!strcasecmp(iprop->name, "Categories"))
@@ -875 +862 @@
-                        }
-                }
-                else if(!strcmp("Uid", fieldname)) {
-                        xmlfield_key_to_attr(in_xmlfield, "Content", on_todo, "Uid");
-                }
-                else if(!strcmp("RecurrenceRule", fieldname)) {
-                        xmlfield_recur_to_attr(in_xmlfield, on_todo);
@@ -1039 +1023 @@
-                                        g_strfreev(categorytokens);
-                                }
-                                else if(!strcasecmp(iprop->name, "uid")) 
-                                {
-                                        out_xmlfield = osync_xmlfield_new(out_xmlformat, "Uid", error);
-                                        osync_xmlfield_set_key_value(out_xmlfield, "Content", iprop->children->content);
-                                }
-                        }
-                        /* FIXME Stuff to handle:
@@ -1160 +1139 @@
-                else if(!strcmp("DateEnd", fieldname)) {
-                        xmlfield_vtime_to_attr_time_t(in_xmlfield, on_event, "end");
-                }
-                else if(!strcmp("Uid", fieldname)) {
-                        xmlfield_vtime_to_attr_time_t(in_xmlfield, on_event, "uid");
-                }
-                else if(!strcmp("Categories", fieldname)) {

plugins/opie-sync/src/opie_format.h

@@ -27 +27 @@
-
-void xmlfield_key_to_attr(OSyncXMLField *xmlfield, const char *key, xmlNode *node_to, const char *attrname);
+void xmlfield_uid_to_attr(OSyncXMLField *xmlfield, xmlNode *node_to);
+void xml_uid_attr_to_xmlfield(const char *uid, const char *nodename, OSyncXMLFormat *out_xmlformat, OSyncError **error);
-time_t xmlfield_vtime_to_attr_time_t(OSyncXMLField *xmlfield, xmlNode *node_to, const char *attrname);
-void xmlfield_categories_to_attr(OSyncXMLField *in_xmlfield, xmlNode *node_to, const char *category_attr);

plugins/opie-sync/src/opie_sync.c

@@ -34 +34 @@
-#include "opie_xml.h"
-
-GTree *uidmap_read(const char *uidmap_file);
-void uidmap_write(GTree *uidmap, const char *uidmap_file);
-void uidmap_free(GTree **uidmap);
-void uidmap_addmapping(GTree *uidmap, const char *opie_uid, const char *ext_uid);
-char *uidmap_set_node_uid(GTree *uidmap, xmlNode *node, xmlDoc *doc, 
-                                                                                                 const char *listelement, const char *itemelement, const char *ext_uid);
-const char *uidmap_get_mapped_uid(GTree *uidmap, const char *uid);
-void uidmap_removemapping(GTree *uidmap, const char *uid1);
-                
-/* sync_cancelled()
- * 
@@ -302 +293 @@
-                        opie_xml_category_ids_to_names(env->plugin_env->categories_doc, item_node);
-                
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-                
-                char *data = xml_node_to_text(env->doc, item_node);
@@ -337 +312 @@
-                OSyncChangeType changetype = osync_hashtable_get_changetype(env->hashtable, uid, hash);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                g_free(hash);
-
-                OSyncData *odata = osync_data_new(data, strlen(data) + 1, env->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);
-
-                // just report the change via
-                osync_context_report_change(ctx, change);
-
-                osync_change_unref(change);
-
-                g_free(uid);
-                
@@ -448 +419 @@
-                char *change_str = NULL;
-                osync_data_get_data(change_data, &change_str, &change_size);
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-        
@@ -466 +445 @@
-                case OSYNC_CHANGE_TYPE_DELETED:
-                        if(!opie_uid) {
-
-
-
-
+
-                                        opie_uid = g_strdup(ext_uid);
-                                else
-, env->itemelement
-
-opie_xml_remove_by_uid(env->doc, env->listelement, env->itemelement, opie_uid);
-uidmap_removemapping(env->plugin_env->uidmap, ext
+
+
+if(opie_uid)
+       opie_xml_remove_by_uid(env->doc, env->listelement, env->itemelement, opie
-                        break;
-                
@@ -642 +618 @@
-        env->connected = FALSE;
-        
-        const char *configdir = osync_plugin_info_get_configdir(info);
-        char *uidmap_path = g_strdup_printf("%s/opie_uidmap.xml", configdir);
-        env->uidmap = uidmap_read(uidmap_path);
-        g_free(uidmap_path);
-        
-        comms_init();
-        
@@ -672 +643 @@
-
-        comms_shutdown();
-        
-        uidmap_write(env->uidmap, env->uidmap_file);
-        uidmap_free(&env->uidmap);
-        g_free(env->uidmap_file);
-        
-        g_mutex_free(env->plugin_mutex);
@@ -714 +681 @@
-}
-
-
-void uidmap_addmapping(GTree *uidmap, const char *uid1, const char *uid2) {
-        char *key = g_strdup(uid1);
-        char *value = g_strdup(uid2);
-        g_tree_insert(uidmap, key, value);
-}
-
-void uidmap_removemapping(GTree *uidmap, const char *uid1) {
-        const char *uid2 = uidmap_get_mapped_uid(uidmap, uid1);
-        if(uid2) {
-                char *uid2_copy = g_strdup(uid2);
-                g_tree_remove(uidmap, uid1);
-                g_tree_remove(uidmap, uid2_copy);
-                g_free(uid2_copy);
-        }
-}
-
-char *uidmap_set_node_uid(GTree *uidmap, xmlNode *node, xmlDoc *doc, 
-                                                                                                 const char *listelement, const char *itemelement, const char *ext_uid) {
-        const char *uidentry = uidmap_get_mapped_uid(uidmap, ext_uid);
-        char *opie_uid;
-        if(uidentry) {
-                opie_xml_set_uid(node, uidentry);
-                opie_uid = g_strdup(uidentry);
-        }
-        else {
-                if(!strcmp(node->name,"note")) {
-                        opie_uid = g_strdup(ext_uid);
-                }
-                else {
-                        opie_uid = opie_xml_set_ext_uid(node, doc, listelement, itemelement, ext_uid);
-                        uidmap_addmapping(uidmap, opie_uid, ext_uid);
-                        uidmap_addmapping(uidmap, ext_uid, opie_uid);
-                }
-        }
-        return opie_uid;
-}
-
-const char *uidmap_get_mapped_uid(GTree *uidmap, const char *uid) {
-        const char *uidentry = (const char *)g_tree_lookup(uidmap, uid);
-        return uidentry;
-}
-
-gint uidmap_compare(gconstpointer a, gconstpointer b, gpointer user_data) {
-        return strcmp((const char *)a, (const char *)b);
-}
-
-GTree *uidmap_read(const char *uidmap_file) {
-        GTree *uidmap = g_tree_new_full(uidmap_compare, NULL, g_free, g_free);
-        xmlDoc *doc = opie_xml_file_open(uidmap_file);
-        if(doc) {
-                xmlNode *node = opie_xml_get_first(doc, "mappinglist", "mapping");
-                while(node) {
-                        char *uid1 = xmlGetProp(node, "uid1");
-                        if(uid1) {
-                                char *uid2 = xmlGetProp(node, "uid2");
-                                if(uid2) {
-                                        uidmap_addmapping(uidmap, uid1, uid2);
-                                        xmlFree(uid2);
-                                }
-                                xmlFree(uid1);
-                        }
-                        node = opie_xml_get_next(node);
-                }
-        }
-        return uidmap;
-}
-
-gboolean uidmap_write_entry(gpointer key, gpointer value, gpointer data) {
-        xmlNode *node = xmlNewNode(NULL, "mapping");
-        xmlSetProp(node, "uid1", (const char *)key);
-        xmlSetProp(node, "uid2", (const char *)value);
-        xmlAddChild((xmlNode *)data, node);
-        return FALSE;
-}
-
-void uidmap_write(GTree *uidmap, const char *uidmap_file) {
-        xmlDoc *doc = xmlNewDoc((xmlChar*)"1.0");
-        if(doc) {
-                xmlNode *root = xmlNewNode(NULL, "uidmap");
-                xmlDocSetRootElement(doc, root);
-                xmlNode *listnode = xmlNewNode(NULL, "mappinglist");
-                xmlAddChild(root, listnode);
-                
-                g_tree_foreach(uidmap, uidmap_write_entry, listnode); 
-                
-                xmlSaveFormatFile(uidmap_file, doc, 1);
-        }
-}
-
-void uidmap_free(GTree **uidmap) {
-        g_tree_destroy(*uidmap);
-        uidmap = NULL;
-}
-
-osync_bool get_sync_info(OSyncPluginEnv *env, OSyncError **error)
-{

plugins/opie-sync/src/opie_sync.h

@@ -80 +80 @@
-        OpieSinkEnv*      note_env;
-        
-        GTree*            uidmap;
-        char*             uidmap_file;
-        
-        GMutex*           plugin_mutex;
-};

plugins/opie-sync/src/opie_xml.c

@@ -316 +316 @@
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
-char *opie_xml_set_ext_uid(xmlNode *node, xmlDoc *doc, const char *listelement,
-                                                                                                                                                                const char *itemelement, const char *tagged_uid) {
-
-
-
+
+
-                uid = opie_xml_generate_uid(doc, listelement, itemelement);
-        }
-        opie_xml_set_uid(node, uid);
-        return uid;
@@ -356 +363 @@
-}
-
+char *opie_xml_tag_uid(const char *uid, const char *nodename) {
+        char *uidtag = "uid-unknown-%32s";
+        if(!strcasecmp(nodename, "Contact")) {
+                uidtag = "uid-contact-%s";
+        }
+        else if(!strcasecmp(nodename, "Task")) {
+                uidtag = "uid-todo-%s";
+        }
+        else if(!strcasecmp(nodename, "event")) {
+                uidtag = "uid-event-%s";
+        }
+        else if(!strcasecmp(nodename, "note")) {
+                uidtag = "%s";
+        }
+        
+        return g_strdup_printf(uidtag, uid);
+}
+
-char *opie_xml_get_tagged_uid(xmlNode *node) {
-        char *uidtag = "uid-unknown-%32s";
-        if(!strcasecmp(node->name, "Contact")) {
-                uidtag = "uid-contact-%s";
-        }
-        else if(!strcasecmp(node->name, "Task")) {
-                uidtag = "uid-todo-%s";
-        }
-        else if(!strcasecmp(node->name, "event")) {
-                uidtag = "uid-event-%s";
-        }
-        
-        char *uid = opie_xml_get_uid(node);
-        if(uid) {
-g_strdup_printf(uidtag, uid
+opie_xml_tag_uid(uid, node->name
-                xmlFree(uid);
-                return tagged_uid;

plugins/opie-sync/src/opie_xml.h

@@ -45 +45 @@
-char *xml_node_to_text(xmlDoc *doc, xmlNode *node); 
-void xml_node_to_attr(xmlNode *node_from, const char *nodename, xmlNode *node_to, const char *attrname);
-, const char *node_name
+
-char *opie_xml_set_ext_uid(xmlNode *node, xmlDoc *doc, const char *listelement,
-                                                                                                                                                                const char *itemelement, const char *tagged_uid);
-char *opie_xml_generate_uid(xmlDoc *doc, const char *listelement, const char *itemelement);
+char *opie_xml_tag_uid(const char *uid, const char *nodename);
-char *opie_xml_get_tagged_uid(xmlNode *node);
-char *opie_xml_get_uidattr(xmlNode *node);