Changeset 2451

Timestamp:

08/15/07 15:14:04 (1 year ago)

Author:

paule

Message:

Add alarm support for todos/events - still needs testing

Files:

• plugins/opie-sync/src/opie_format.c (modified) (12 diffs)
• plugins/opie-sync/src/opie_format.h (modified) (1 diff)

plugins/opie-sync/src/opie_format.c

@@ -674 +674 @@
-                /* Due date */
-                GDate *duedate = NULL;
+                char *duedatestr = NULL;
-                char *hasDate = xmlGetProp(icur, "HasDate");
-                if(hasDate) { 
@@ -684 +685 @@
-                                        int datemonth = atoi(datemonthstr);
-                                        int dateday = atoi(datedaystr);
-char *
+
-                                        duedate = g_date_new_dmy(dateday, datemonth, dateyear);
-                                        out_xmlfield = osync_xmlfield_new(out_xmlformat, "DateDue", error);
-                                        osync_xmlfield_set_key_value(out_xmlfield, "Content", duedatestr);
-                                        g_free(duedatestr);
-                                        // RFC2445 says the default value type is DATE-TIME. But Opie only
-                                        // stores DATE as due date => alter VALUE to DATE
@@ -705 +705 @@
-                /* Alarms */
-                char *alarmstr = xmlGetProp(icur, "Alarms");
-
-
+
+
+
+
+
+
+
+
+
-                        xmlFree(alarmstr);
-                }
-                
-                if(duedate)
@@ -870 +876 @@
-        
-        /* Convert alarms */
-
+, duestr
-        
-        if(!completedstr)
@@ -1709 +1715 @@
-                int i,j;
-                for(j=0; alarmentries[j] != NULL; j++) {
-//
+
-                        
-                        // Opie alarm entry format: ddmmyyyyhhmmss:0:<0=silent,1=loud>:[;nextalarmentry]
@@ -1726 +1732 @@
-                        g_strfreev(alarmargs);
-                        
-                        /* FIXME since alarm support is not complete in the OpenSync xmlformat code, the code 
-                           below is not finished */
-                        
-/* 
-                        if(alarmsound == 1)
-                                osync_xmlfield_set_key_value(out_xmlfield, "AlarmAction", "AUDIO");
@@ -1742 +1744 @@
-                                
-                                if(starttime) {
-                                        // This is nice in theory, but Opie todo events don't support due time so
-                                        //  we can't use this code in practice
-                                        char *alarmdu = osync_time_sec2alarmdu((int)difftime(alarmtime, *starttime)); 
-                                        if(alarmdu) {
-
-
-
+
+
-                                        }
-                                }
-                                else {
-                                        xmlNode *on_trigger = xmlNewTextChild(node_to, NULL, (xmlChar*) "AlarmTrigger", NULL);
-                                        xmlNewTextChild(on_trigger, NULL, (xmlChar*)"Content", (xmlChar*) alarmdatestr_utc);
-                                        xmlNewTextChild(on_trigger, NULL, (xmlChar*)"Value", (xmlChar*) "DATE-TIME");
-                                }
-                                g_free(alarmdatestr_utc);
@@ -1760 +1754 @@
-                                g_free(alarmdatestr);
-                        }
-*/
-                }
-                g_strfreev(alarmentries);
@@ -1766 +1759 @@
-}
-
-
+, const char *duedate
-        /* Convert OpenSync XML Alarm entries on a todo node to Opie Alarms attribute value */
-/*      xmlNode *cur;
-        xmlNode *alarm_node;
-        int i, numnodes;*/
-        
-        GString *alarms = g_string_new("");
@@ -1778 +1768 @@
-                const char *fieldname = osync_xmlfield_get_name(in_xmlfield);
-                if(!strcmp("Alarm", fieldname)) {
-                        /* FIXME since alarm support is not complete in the OpenSync xmlformat code, the code 
-                           below is not finished */
-/* 
-                        char *alarmdatestr = NULL;
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-                                
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-                        }
-                        
-                        if(alarmdatestr) {
-                                cur = osxml_get_node(alarm_node, "AlarmAction");
-                                int alarmsound = 0;
-
-
-
-
-
-
-
+
+
+
+
-                                }
-                                g_string_append_printf(alarms, "%s:0:%d:;", alarmdatestr, alarmsound);
-                        }
-*/              
-                        
-                }
@@ -1863 +1816 @@
-        /* Convert OpenSync XML Alarm entries on a calendar event node to Opie alarm/sound attribute values */
-        
-/*      
-        xmlNode *cur;
-        int alarmseconds = 15 * 60; // Default 15 minutes
-                
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-                        
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-                        }
-                        
-                        if(contentstr)
-                                xmlFree(contentstr);
-                        if(typestr)
-                                xmlFree(typestr);
-                
-                        char *alarmstr = g_strdup_printf("%d", alarmseconds / 60);
-                        xmlSetProp(node_to, "alarm", alarmstr);
-                        g_free(alarmstr);
-                        
-                        cur = osxml_get_node(alarm_node, "AlarmAction");
-                        int alarmsound = 0;
-                        if(cur) {
-                                char *alarmaction = xmlNodeGetContent(cur);
-                                if(alarmaction) {
-                                        if(!strcmp(alarmaction, "AUDIO"))
-                                                alarmsound = 1;
-                                        xmlFree(alarmaction);
-                                }
-                        }
-                        
-                        if(alarmsound == 1)
@@ -1918 +1841 @@
-                        else
-                                xmlSetProp(node_to, "sound", "silent");
-
-
-
+
+
+
+
+
+
+
-}

plugins/opie-sync/src/opie_format.h

@@ -34 +34 @@
-void xmlfield_recur_to_attr(OSyncXMLField *in_xmlfield, xmlNode *node_to);
-void xml_todo_alarm_attr_to_xmlfield(const char *alarmstr, OSyncXMLFormat *out_xmlformat, time_t *starttime, OSyncError **error);
-
+, const char *duedate
-void xmlformat_cal_alarms_to_attr(OSyncXMLFormat *in_xmlformat, xmlNode *node_to, time_t *starttime);
-