Changeset 2118

Timestamp:

06/09/07 19:39:29 (1 year ago)

Author:

dgollub

Message:

Updated the gnokii-event converter.

Files:

• plugins/gnokii-sync/src/gnokii_calendar.c (modified) (2 diffs)
• plugins/gnokii-sync/src/gnokii_calendar_format.c (modified) (5 diffs)

plugins/gnokii-sync/src/gnokii_calendar.c

@@ -367 +367 @@
-                        break;
-
-                OSyncChange *change = osync_change_new(&error);
-
-                // prepare UID with gnokii-calendar-<memory location>
-                uid = g_strdup_printf ("gnokii-calendar-%i", calnote->location);
-                osync_hashtable_report(sinkenv->hashtable, uid);
-
-                // get hash of calnote
-                hash = gnokii_calendar_hash(calnote);
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                osync_change_set_hash(change, hash);    
-
-
+
-
-                // set data
-
-
+
+
+
-                        osync_change_unref(change);
-                        osync_context_report_osyncwarning(ctx, error);
@@ -388 +398 @@
-                        g_free(hash);
-                        g_free(uid);
+                        g_free(calnote);
-                        continue;
-                }
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-                g_free(hash);

plugins/gnokii-sync/src/gnokii_calendar_format.c

@@ -56 +56 @@
-
-        // Type
-y
+ies
-        switch (cal->type) {
-                case GN_CALNOTE_MEETING:
@@ -289 +289 @@
-}
-
+static void _xmlfield_category(gn_calnote *calnote, OSyncXMLField *xmlfield)
+{
+        int i;
+        int numnodes = osync_xmlfield_get_key_count(xmlfield);
+        for (i=0; i < numnodes; i++) {
+                const char *category = osync_xmlfield_get_nth_key_value(xmlfield, i);
+
+                if (!strcasecmp(category, "Meeting"))
+                        calnote->type = GN_CALNOTE_MEETING;
+                else if (!strcasecmp(category, "Calling"))
+                        calnote->type = GN_CALNOTE_CALL;
+                else if (!strcasecmp(category, "Birthday"))
+                        calnote->type = GN_CALNOTE_BIRTHDAY;
+                else if (!strcasecmp(category, "Reminder"))
+                        calnote->type = GN_CALNOTE_REMINDER;
+                else if (!strcasecmp(category, "Memo"))
+                        calnote->type = GN_CALNOTE_MEMO;
+
+                else
+                        // When no known type was found it will check later
+                        // for a valid type. 
+                        calnote->type = 0;
+
+        }
+}
+
+static void _xmlfield_datestarted(gn_calnote *calnote, OSyncXMLField *xmlfield, int *alldayevent)
+{
+
+        const char *dtstart = osync_xmlfield_get_key_value(xmlfield, "Content");
+
+        struct tm *starttm = osync_time_vtime2tm(dtstart);
+        struct tm *tmptm = NULL;
+
+        if (!osync_time_isdate(dtstart) && osync_time_isutc(dtstart)) {
+                tmptm = starttm;
+                int offset = osync_time_timezone_diff(tmptm);
+                starttm = osync_time_tm2localtime(tmptm, offset);
+                g_free(tmptm);
+        }
+
+        calnote->time = gnokii_util_tm2timestamp(starttm);
+
+        g_free(starttm);
+
+        // Only 3 matches (=date) means all day event 
+        if (osync_time_isdate(dtstart))
+                *alldayevent = 1;
+
+        // Nokia cellphones cannot handle seconds in calendar - so set it to ZERO
+        calnote->time.second = 0;
+
+}
+
+void static _xmlfield_dateend(gn_calnote *calnote, OSyncXMLField *xmlfield)
+{
+
+        const char *dtend = osync_xmlfield_get_key_value(xmlfield, "Content");
+
+
+        struct tm *endtm = osync_time_vtime2tm(dtend);
+        struct tm *tmptm = NULL;
+        if (!osync_time_isdate(dtend) && osync_time_isutc(dtend)) {
+                tmptm = endtm;
+                int offset = osync_time_timezone_diff(tmptm);
+                endtm = osync_time_tm2localtime(tmptm, offset);
+                g_free(tmptm);
+        }
+
+        calnote->end_time = gnokii_util_tm2timestamp(endtm);
+        g_free(endtm);
+
+        // Nokia cellphones cannot handle seconds in calendar so set it to ZERO
+        calnote->end_time.second = 0;
+
+}
+
-/* 
- * Converts from XMLFormat-event to the gnokii event object type (gn_calnote).
@@ -297 +374 @@
-                        output, outpsize, config, free_input, error);
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-        osync_bool alldayevent = 0;
-
-
-
-
-
+
+
+
-                goto error;
-        }
-
-        if (xmlStrcmp(root->name, (xmlChar *) "vcal")) {
-                osync_error_set(error, OSYNC_ERROR_GENERIC, "Wrong (event) xml root element");
-                goto error;
-        }
-
-        // Event child
-        root = osxml_get_node(root, "Event");
-
-        // prepare calnote
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                
-
-        // DateEnd
-        cur = osxml_get_node(root, "DateEnd");
-        if (cur) {
-
-                tmp = osxml_find_node(cur, "Content");
-
-                endtm = osync_time_vtime2tm(tmp);
-                if (!osync_time_isdate(tmp) && osync_time_isutc(tmp)) {
-                        tmptm = endtm;
-                        endtm = osync_time_tm2localtime(tmptm, offset);
-                        g_free(tmptm);
-                }
-
-                g_free(tmp);
-
-                calnote->end_time = gnokii_util_tm2timestamp(endtm);
-
-                g_free(endtm);
-
-                // Nokia cellphones cannot handle seconds in calendar so set it to ZERO
-                calnote->end_time.second = 0;
-        }
-
-        /* Alarm - TODO: is not fully supported
@@ -422 +415 @@
-         *              # ...
-         */
+
+        /* TODO porting to new XMLFormat-even layout */
+        /*
-        cur = osxml_get_node(root, "Alarm");
-        if (cur && calnote->time.year) {
@@ -514 +510 @@
-                        calnote->recurrence = GN_CALNOTE_2WEEKLY;
-        }
+        */
-
-        // check for type which fits for given data if no type was set