Changeset 2454

Timestamp:

08/16/07 11:43:09 (1 year ago)

Author:

paule

Message:

Fix for various XML format errors; fix segfault when converting todo alarms from Opie; sort xml contact fields

Files:

• plugins/opie-sync/src/opie_format.c (modified) (13 diffs)

plugins/opie-sync/src/opie_format.c

@@ -324 +324 @@
-        xmlFreeDoc(idoc);
-
-
+ by adding in a pre-sorted way
-        osync_xmlformat_sort(out_xmlformat);
+        if(oxf_name)
+                osync_xmlfield_sort(oxf_name);
+        if(oxf_organisation)
+                osync_xmlfield_sort(oxf_organisation);
+        if(oxf_homeaddress)
+                osync_xmlfield_sort(oxf_homeaddress);
+        if(oxf_workaddress)
+                osync_xmlfield_sort(oxf_workaddress);
-        
-        unsigned int size;
@@ -634 +642 @@
-                                        }
-                                        out_xmlfield = osync_xmlfield_new(out_xmlformat, "Status", error);
-iprop->children->content
+status
-                                }
-                                else if(!strcasecmp(iprop->name, "StartDate"))
@@ -640 +648 @@
-                                        out_xmlfield = osync_xmlfield_new(out_xmlformat, "DateStarted", error);
-                                        osync_xmlfield_set_key_value(out_xmlfield, "Content", iprop->children->content);
-key_value(out_xmlfield, "Value", "DATE"); /* FIXME I doubt this is still valid */
+attr(out_xmlfield, "Value", "DATE");
-                                }
-                                else if(!strcasecmp(iprop->name, "Categories"))
@@ -665 +673 @@
-                                        // RFC2445 says the default value type is DATE-TIME. But Opie only
-                                        // stores DATE as completed date => alter VALUE to DATE
-key_value(out_xmlfield, "Value", "DATE"); /* FIXME I doubt this is still valid */
+attr(out_xmlfield, "Value", "DATE");
-                                        xmlFree(completeDate);
-                                }
@@ -687 +695 @@
-                                        duedatestr = g_strdup_printf("%04d%02d%02d", dateyear, datemonth, dateday);
-                                        duedate = g_date_new_dmy(dateday, datemonth, dateyear);
-ateD
+
-                                        osync_xmlfield_set_key_value(out_xmlfield, "Content", duedatestr);
-                                        // RFC2445 says the default value type is DATE-TIME. But Opie only
-                                        // stores DATE as due date => alter VALUE to DATE
-key_value(out_xmlfield, "Value", "DATE"); /* FIXME I doubt this is still valid */
+attr(out_xmlfield, "Value", "DATE");
-                                }
-                                if(datedaystr)   xmlFree(datedaystr);
@@ -726 +734 @@
-        xmlFreeDoc(idoc);
-
-
+ by adding in a pre-sorted way
-        osync_xmlformat_sort(out_xmlformat);
-        
@@ -827 +835 @@
-                        }
-                }
-ateD
+
-                        duestr = osync_xmlfield_get_key_value(in_xmlfield, "Content");
-                        if(duestr) {
@@ -978 +986 @@
-                                                char *startvdate = g_strdup_printf("%04d%02d%02d", localtm->tm_year + 1900, (localtm->tm_mon + 1), localtm->tm_mday);
-                                                osync_xmlfield_set_key_value(out_xmlfield, "Content", startvdate);
-key_value
+attr
-                                                g_free(startvdate);
-                                                g_free(localtm);
@@ -1009 +1017 @@
-                                                char *endvdate = g_strdup_printf("%04d%02d%02d", localtm->tm_year + 1900, (localtm->tm_mon + 1), localtm->tm_mday);
-                                                osync_xmlfield_set_key_value(out_xmlfield, "Content", endvdate);
-key_value
+attr
-                                                g_free(endvdate);
-                                                g_free(localtm);
@@ -1074 +1082 @@
-        xmlFreeDoc(idoc);
-
-
+ by adding in a pre-sorted way
-        osync_xmlformat_sort(out_xmlformat);
-        
@@ -1239 +1247 @@
-        xmlFreeDoc(idoc);
-
-
+ by adding in a pre-sorted way
-        osync_xmlformat_sort(out_xmlformat);
-        
@@ -1419 +1427 @@
-        time_t utime = 0;
-        if(vtime) {
-key_value
+attr
-                if(vtimetype && !strcasecmp(vtimetype, "DATE")) {
-                        /* vtime has date but no time, so we treat it as midnight local time */
@@ -1723 +1731 @@
-                        for(i=0; alarmargs[i]!=NULL; i++) {
-                                if(i==0) {
-
-
-
+
+
+
+
+
-                                }
-                                else if(i==2)