Changeset 2097

Timestamp:

06/07/07 13:31:22 (1 year ago)

Author:

dgollub

Message:

Initial port of gnokii-sync to 0.30 API
Still not working .. quick hack on a 3h train ride.
Facing some problems with libgnokii :(

Files:

• plugins/gnokii-sync/Makefile.am (deleted)
• plugins/gnokii-sync/SConstruct (added)
• plugins/gnokii-sync/build (added)
• plugins/gnokii-sync/build/linux (added)
• plugins/gnokii-sync/build/linux/osync_build.py (added)
• plugins/gnokii-sync/build/osync_support.py (added)
• plugins/gnokii-sync/configure.in (deleted)
• plugins/gnokii-sync/src/Makefile.am (deleted)
• plugins/gnokii-sync/src/SConscript (added)
• plugins/gnokii-sync/src/gnokii_calendar.c (modified) (10 diffs)
• plugins/gnokii-sync/src/gnokii_calendar.h (modified) (1 diff)
• plugins/gnokii-sync/src/gnokii_calendar_format.c (modified) (11 diffs)
• plugins/gnokii-sync/src/gnokii_config.c (modified) (1 diff)
• plugins/gnokii-sync/src/gnokii_config.h (modified) (1 diff)
• plugins/gnokii-sync/src/gnokii_contact.c (modified) (11 diffs)
• plugins/gnokii-sync/src/gnokii_contact.h (modified) (1 diff)
• plugins/gnokii-sync/src/gnokii_contact_format.c (modified) (8 diffs)
• plugins/gnokii-sync/src/gnokii_format.c (deleted)
• plugins/gnokii-sync/src/gnokii_sync.c (modified) (7 diffs)
• plugins/gnokii-sync/src/gnokii_sync.h (modified) (3 diffs)

plugins/gnokii-sync/src/gnokii_calendar.c

@@ -325 +325 @@
-/* The function get all event entries with gnokii_calendar_get_calnote() and checks for
- * changes by comparing old hash with new hash....
- *
- * Return: bool
- * ReturnVal: TRUE on success
- * ReturnVal: FALSE on error
- */
-
+
+
-{
-)", __func__
+, %p, %p)", __func__, plugindata, info
-
-        int i = 0;
@@ -340 +337 @@
-        gn_calnote *calnote = NULL;
-
+        
+        OSyncError *error = NULL;
+
+
+        OSyncObjTypeSink *sink = osync_plugin_info_get_sink(info);
+
-        gn_data *caldata = (gn_data *) malloc(sizeof(gn_data));
-
@@ -347 +350 @@
-        caldata->calnote_list = &calendar_list; 
-
-
+
+
-
-        // check for slowsync and prepare the "event" hashtable if needed
-member_get_slow_sync(env->member, "event") == TRUE) {
+objtype_sink_get_slowsync(sink)) {           
-                osync_trace(TRACE_INTERNAL, "slow sync");
-set_slow_sync(env->hashtable, "event"
+reset(sinkenv->hashtable
-        }
-
@@ -363 +367 @@
-                        break;
-
-
-
+
-
-                // prepare UID with gnokii-calendar-<memory location>
-                uid = g_strdup_printf ("gnokii-calendar-%i", calnote->location);
-                osync_change_set_uid(change, uid);
-                g_free(uid);
-
-                // get hash of calnote
-                hash = gnokii_calendar_hash(calnote);
-                osync_change_set_hash(change, hash);    
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                        osync_trace(TRACE_INTERNAL, "Position: %i Needs to be reported (!= hash)", calnote->location);
-                        osync_context_report_change(ctx, change);
-env->hashtable, change
+sinkenv->hashtable, type, uid, hash
-                }       
-
+                g_free(hash);
+                g_free(uid);
-        }
-
-        osync_trace(TRACE_INTERNAL, "number of calendar notes: %i", i - 1);
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        g_free(caldata);
-
-        osync_trace(TRACE_EXIT, "%s", __func__);
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-        OSyncError *error = NULL;
@@ -413 +455 @@
-        char *uid = NULL;
-        char *hash = NULL;
-
-
+
+
+
+
+
-
-        // Get changed calendar note
-
+
+
+
-
-        // Check for type of changes
-        switch (osync_change_get_changetype(change)) {
-CHANG
+OSYNC_CHANGE_TYP
-                        // Delete the change
-
@@ -431 +478 @@
-                        
-                        break;
-CHANG
+OSYNC_CHANGE_TYP
-
-                        // Add the change
@@ -450 +497 @@
-
-                        break;
-CHANG
+OSYNC_CHANGE_TYP
-                        // Modify the change
-
@@ -465 +512 @@
-
-                        /////////// WORKAROUND for "dirty" modify ///////////
+                        /*
-
-                        // fake a delete change to remove the old hash
-
-
+
-
-                        // the old uid will be set for this "fake" change
-                        osync_change_set_uid(delete_change, osync_change_get_uid(change));
-
-
+
+
+
+
+
-
-                        // update the old UID with the followed UID for the hashtable
@@ -479 +529 @@
-                        uid = gnokii_calendar_memory_uid(calnote->location);
-                        osync_change_set_uid(change, uid);
-
+
-
-                        // set modified changetype for calendar entry 
-CHANG
+OSYNC_CHANGE_TYP
-
-                        // set hash for the modified calendar entry
-                        hash = gnokii_calendar_hash(calnote);
-                        osync_change_set_hash(change, hash);
+
+                        osync_hashtable_write(sinkenv->hashtable, uid, hash);
+
-                        g_free(hash);
+                        g_free(uid);
-
-                        /*
@@ -513 +567 @@
-        */
-                       
+        g_free(calnote);
-        
-        // update hashtable
-env->hashtable, change
+sinkenv->hashtable, osync_change_get_changetype(change), osync_change_get_uid(change), osync_change_get_hash(change)
-
-        osync_trace(TRACE_EXIT, "%s", __func__);
-
-
+
-
-error:
-&
+
-        osync_trace(TRACE_EXIT_ERROR, "%s: %s", __func__, osync_error_print(&error));
-
-
-
-
+
+
+

plugins/gnokii-sync/src/gnokii_calendar.h

@@ -21 +21 @@
-#include "gnokii.h"
-
-osync_bool gnokii_calendar_get_changeinfo(
-osync_bool gnokii_calendar_commit(
+void gnokii_calendar_get_changes(void *plugindata, OSyncPluginInfo *info, 
+void gnokii_calendar_commit_change(void *plugindata, OSyncPluginInfo *info, 
-

plugins/gnokii-sync/src/gnokii_calendar_format.c

@@ -19 +19 @@
- ***************************************************************************/
-
-
+
+
+
+
+
+
+
+
-#include "gnokii_calendar_utils.h"
-#include "gnokii_calendar_format.h"
-#include <opensync/opensync_xml.h>
-
-/*
- * Converts the gnokii event object type (gn_calnote) into XML.
- */
-(void *conv_data, char *input, int inpsize, char **output, int *outpsize, osync_bool *free_input
+format(char *input, unsigned int inpsize, char **output, unsigned int *outpsize, osync_bool *free_input, const char *config
-{
-
-
-
+
+
+
+
-        time_t timet;
-        time_t start_timet = 0;
@@ -46 +52 @@
-        }
-
-
-
-
+
+
-
-        // Type
-current = xmlNewTextChild(root, NULL, (xmlChar *) "Categories", NULL
+xmlfield = osync_xmlfield_new(xmlformat, "Category", error
-        switch (cal->type) {
-                case GN_CALNOTE_MEETING:
- osxml_node_add(current
+osync_xmlfield_set_key_value(xmlfield
-                         break;
-                case GN_CALNOTE_CALL:
- osxml_node_add(current
+osync_xmlfield_set_key_value(xmlfield
-                         break;
-                case GN_CALNOTE_BIRTHDAY:
-xml_node_add(current
+ync_xmlfield_set_key_value(xmlfield
-                         break;
-                case GN_CALNOTE_REMINDER:
-xml_node_add(current
+ync_xmlfield_set_key_value(xmlfield
-                         break;
-                case GN_CALNOTE_MEMO: 
-xml_node_add(current
+ync_xmlfield_set_key_value(xmlfield
-                         break;
-        }
@@ -104 +109 @@
-
-                osync_trace(TRACE_SENSITIVE, "start time: %s (ical - UTC)\n", vtime);
-
-
-
+
+
-                g_free(vtime);
-
@@ -141 +145 @@
-                }
-
-current = xmlNewTextChild(root, NULL, (xmlChar *) "DateEnd", NULL
-xmlNewTextChild(current, NULL, (xmlChar*) "Content", (xmlChar*)
+xmlfield = osync_xmlfield_new(xmlformat, "DateEnd", error
+osync_xmlfield_set_key_value(xmlfield, "Content",
-
-                g_free(tmp);    
@@ -187 +191 @@
-                tmp = gnokii_util_secs2alarmevent(secs_before_event);   
-                
-current = xmlNewTextChild(root, NULL, (xmlChar *) "Alarm", NULL
+xmlfield = osync_xmlfield_new(xmlformat, "Alarm", error
-
-                if (cal->alarm.tone)
-xmlNewTextChild(current, NULL, (xmlChar*) "AlarmAction", (xmlChar*)
-
-
-xmlNewTextChild(sub, NULL, (xmlChar*) "Content", (xmlChar*) tmp); 
-xmlNewTextChild(sub, NULL, (xmlChar*) "Value", (xmlChar*)
+osync_xmlfield_set_key_value(xmlfield, "AlarmAction",
+
+
+osync_xmlfield_set_key_value(xmlfield, "AlarmTrigger", tmp);
+osync_xmlfield_set_attr(xmlfield, "Value",
-
-                g_free(tmp);
@@ -201 +205 @@
-        // Summary
-        if (cal->text) {
-current = xmlNewTextChild(root, NULL, (xmlChar*) "Summary", NULL
-xmlNewTextChild(current, NULL, (xmlChar*) "Content", (xmlChar *)
+xmlfield = osync_xmlfield_new(xmlformat, "Summary", error
+osync_xmlfield_set_key_value(xmlfield, "Content",
-        }
-
-        // Phone Number
-        if (cal->phone_number && cal->type == GN_CALNOTE_CALL) {
-current = xmlNewTextChild(root, NULL, (xmlChar*) "Description", NULL
-xmlNewTextChild(current, NULL, (xmlChar*) "Content", (xmlChar *)
+xmlfield = osync_xmlfield_new(xmlformat, "Description", error
+osync_xmlfield_set_key_value(xmlfield, "Content",
-        }
-
-        // mlocation
-        if (cal->mlocation && cal->type == GN_CALNOTE_MEETING) {
-current = xmlNewTextChild(root, NULL, (xmlChar*) "Location", NULL
-xmlNewTextChild(current, NULL, (xmlChar*) "Content", (xmlChar*)
+xmlfield = osync_xmlfield_new(xmlformat, "Location", error
+osync_xmlfield_set_key_value(xmlfield, "Content",
-        }
-
@@ -220 +224 @@
-        if (cal->recurrence) {
-
+                xmlfield = osync_xmlfield_new(xmlformat, "RecurrenceRule", error);
+
-                switch (cal->recurrence) {
-                        case GN_CALNOTE_DAILY:
-tmp = g_strdup("FREQ=
+osync_xmlfield_set_key_value(xmlfield, "Frequency", "
-                                break;
-                        case GN_CALNOTE_WEEKLY:
-                        case GN_CALNOTE_2WEEKLY:
-tmp = g_strdup("FREQ=
+osync_xmlfield_set_key_value(xmlfield, "Frequency", "
-                                break;
-                        case GN_CALNOTE_MONTHLY:
-tmp = g_strdup("FREQ=
+osync_xmlfield_set_key_value(xmlfield, "Frequency", "
-                                break;
-                        case GN_CALNOTE_YEARLY:
-tmp = g_strdup("FREQ=
+osync_xmlfield_set_key_value(xmlfield, "Frequency", "
-                                break;
-
-
+
-                                break;
-                }
-                
-                current = xmlNewTextChild(root, NULL, (xmlChar*) "RecurrenceRule", NULL);
-                xmlNewTextChild(current, NULL, (xmlChar*) "Rule", (xmlChar*) tmp);
-                g_free(tmp);
-
-                // prepare "by day/day of month/..." string
-                // TODO: BYMONTHDAY
@@ -249 +250 @@
-                                break;
-                        case GN_CALNOTE_2WEEKLY:
-tmp = g_strdup("INTERVAL=4");
-xmlNewTextChild(current, NULL, (xmlChar*) "Rule", (xmlChar*) tmp
+// tmp = g_strdup("INTERVAL=4"); - was 4 wrong?!?!? - Bug?!
+osync_xmlfield_set_key_value(xmlfield, "Interval", "2"
-                        case GN_CALNOTE_WEEKLY:
+                                // XXX: Always BYDAY?
-                                wday = gnokii_util_unix2wday(&start_timet);
-
-
+
-                                g_free(wday);
-                                break;
-                        case GN_CALNOTE_MONTHLY:
+                        case GN_CALNOTE_YEARLY:
+                        case GN_CALNOTE_NEVER:
-                                break;
-
-
-
-
-
-
-
+
+
-        }
-
-        *free_input = TRUE;
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        osync_trace(TRACE_EXIT, "%s", __func__);        
-        return TRUE;
@@ -279 +290 @@
-
-/* 
-
+Format-event
- */  
-_event_to_gnokii(void *conv_data, char *input, int inpsize, char **output, int *outpsize, osync_bool *free_input
+format_to_gnokii_event(char *input, unsigned int inpsize, char **output, unsigned int *outpsize, osync_bool *free_input, const char *config
-{
-p, %i, %p, %p, %p, %p)", __func__, conv_data
-
+i, %p, %p, %s, %p, %p)", __func__
+config, 
-
-        osync_trace(TRACE_SENSITIVE, "Input XML is:\n%s", osxml_write_to_string((xmlDoc *)input));
@@ -540 +551 @@
- * Print the gnokii format in a human readable form.
- */ 
+#if 0
-static char *print_gnokii_event(OSyncChange *change)
-{
-        osync_trace(TRACE_ENTRY, "%s(%p)", __func__, change);
-
-char *tmp = NULL, *type = NULL
+unsigned int size
-        GString *output = g_string_new(""); 
-
+
+
+
+
+
+
-
-        // Event Type
-
-
+char *
+char *
-        output = g_string_append(output, tmp);
-        g_free(type);
@@ -630 +647 @@
-        return g_string_free(output, FALSE);
-}
-
-
-
-
+
+
+
-{
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-}
-
+void get_conversion_info(OSyncFormatEnv *env)
+{
+        OSyncFormatConverter *conv;
+        OSyncError *error = NULL;
+
+        OSyncObjFormat *xmlformat = osync_format_env_find_objformat(env, "xmlformat-event");
+        OSyncObjFormat *gnokii_event = osync_format_env_find_objformat(env, "gnokii-event");
+
+        conv = osync_converter_new(OSYNC_CONVERTER_CONV, xmlformat, gnokii_event, conv_xmlformat_to_gnokii_event, &error);
+        if (!conv) {
+                osync_trace(TRACE_ERROR, "Unable to register format converter: %s", osync_error_print(&error));
+                osync_error_unref(&error);
+                return;
+        }
+        osync_format_env_register_converter(env, conv);
+        osync_converter_unref(conv);
+
+        conv = osync_converter_new(OSYNC_CONVERTER_CONV, gnokii_event, xmlformat, conv_gnokii_event_to_xmlformat, &error);
+        if (!conv) {
+                osync_trace(TRACE_ERROR, "Unable to register format converter: %s", osync_error_print(&error));
+                osync_error_unref(&error);
+                return;
+        }
+        osync_format_env_register_converter(env, conv);
+        osync_converter_unref(conv);
+}
+
+int get_version(void)
+{
+        return 1;
+}
+

plugins/gnokii-sync/src/gnokii_config.c

@@ -57 +57 @@
- * ReturnVal: false     on error
- */
-har *data, int size
+onst char *data
-{
-i, %p)", __func__, config, data, size
+p)", __func__, config, data
-        char *str = NULL;
-        xmlDocPtr doc;
-        xmlNodePtr cur;
-
-ize
+trlen(data) + 1
-
-        if (!doc) {

plugins/gnokii-sync/src/gnokii_config.h

@@ -22 +22 @@
-
-void gnokii_config_state(struct gn_statemachine *state, gn_config *config);
-har *data, int size
+onst char *data
-

plugins/gnokii-sync/src/gnokii_contact.c

@@ -346 +346 @@
-/* The function get all contact entries with gnokii_contact_get_entry() and checks for
- * changes by comparing old hash with new hash....
- *
- * Return: bool
- * ReturnVal: TRUE on success
- * ReturnVal: FALSE on error
- */
-
+
+
-{
-)", __func__
+, %p, %p)", __func__, plugindata, info
-
-        int location = 0, memtype, num_entries;
-        char *hash = NULL;
-        char *uid = NULL;
+        OSyncError *error = NULL;
-        gn_error gnokii_error = GN_ERR_NONE;    // gnokii error messages
-        gn_phonebook_entry *contact = NULL;
@@ -365 +363 @@
-        memset(data, 0, sizeof(gn_data));
-
-
+
+
+
+
+
-
-        // check for slowsync and prepare the "contact" hashtable if needed
-member_get_slow_sync(env->member, "contact") == TRUE) {
+objtype_sink_get_slowsync(sink)) {           
-                osync_trace(TRACE_INTERNAL, "slow sync");
-set_slow_sync(env->hashtable, "contact"
+reset(sinkenv->hashtable
-        }
-
@@ -382 +384 @@
-                memstat.memory_type = memtype; 
-                memstat.used = 0;
+                osync_trace(TRACE_INTERNAL, "env->state: %p", env->state);
-                gnokii_error = gn_sm_functions(GN_OP_GetMemoryStatus, data, env->state);
-                if (gnokii_error != GN_ERR_NONE) {
@@ -417 +420 @@
-                                continue;
-
-
-
+
-
-                        // prepare UID with gnokii-contact-<memory type>-<memory location>
@@ -430 +432 @@
-                        g_free(hash);
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                
-
-
+
+
+
-                                osync_context_report_change(ctx, change);
-env->hashtable, change
+sinkenv->hashtable, type, uid, hash
-                        }       
+
+                        g_free(hash);
+                        g_free(uid);
+
-                }
-        }
@@ -445 +463 @@
-        osync_trace(TRACE_INTERNAL, "number of contact notes: %i", location - 1);
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        osync_trace(TRACE_EXIT, "%s()", __func__);
-        return TRUE;
-}
-
-/* The function commit changes of contact entries to the cellphone.
- * 
- * Return: bool
- * ReturnVal: TRUE on success
- * ReturnVal: FALSE on error
- */
-
-
-
+
+
+
+
+
-
-        OSyncError *error = NULL;
@@ -466 +517 @@
-        char *hash = NULL;
-        
-
+
+
+
-
-        // Get changed contact note
@@ -473 +526 @@
-        // Check for type of changes
-        switch (osync_change_get_changetype(change)) {
-CHANG
+OSYNC_CHANGE_TYP
-                        // Delete the change
-