Changeset 2674

Timestamp:

10/28/07 22:39:00 (1 year ago)

Author:

dgollub

Message:

Sorted and refecorted palmcontact to xmlformat-contact converter.

Files:

• plugins/palm/src/palm_format.c (modified) (2 diffs)

plugins/palm/src/palm_format.c

@@ -1401 +1401 @@
-}
-
+
+static osync_bool _palmcontact_address(OSyncXMLFormat *xmlformat, PSyncContactEntry *entry, OSyncError **error)
+{
+        if (!(has_entry(entry, entryAddress) 
+                || has_entry(entry, entryCity) || has_entry(entry, entryState) 
+                || has_entry(entry, entryZip) || has_entry(entry, entryCountry)))
+                return TRUE;
+
+        char *tmp_address = return_next_entry(entry, entryAddress);
+        char *tmp_city = return_next_entry(entry, entryCity);
+        char *tmp_state = return_next_entry(entry, entryState);
+        char *tmp_zip = return_next_entry(entry, entryZip);
+        char *tmp_country = return_next_entry(entry, entryCountry);
+
+        OSyncXMLField *xmlfield = osync_xmlfield_new(xmlformat, "Address", error);
+        if (!xmlfield)
+                return FALSE;
+
+        //Street
+        if (tmp_address) {
+                osync_xmlfield_set_key_value(xmlfield, "Street", tmp_address);
+                g_free(tmp_address);
+        }
+
+        //City
+        if (tmp_city) {
+                osync_xmlfield_set_key_value(xmlfield, "City", tmp_city);
+                g_free(tmp_city);
+        }
+        
+        //Region
+        if (tmp_state) {
+                osync_xmlfield_set_key_value(xmlfield, "Region", tmp_state);
+                g_free(tmp_state);
+        }
+        
+        //Code
+        if (tmp_zip) {
+                osync_xmlfield_set_key_value(xmlfield, "PostalCode", tmp_zip);
+                g_free(tmp_zip);
+        }
+        
+        //Country
+        if (tmp_country) {
+                osync_xmlfield_set_key_value(xmlfield, "Country", tmp_country);
+                g_free(tmp_country);
+        }
+
+        return TRUE;
+}
+
+static osync_bool _palmcontact_name(OSyncXMLFormat *xmlformat, PSyncContactEntry *entry, OSyncError **error)
+{
+        if (!(has_entry(entry, entryLastname) || has_entry(entry, entryFirstname)))
+                return TRUE;
+        
+        char *tmp_first = return_next_entry(entry, entryFirstname);
+        char *tmp_last  = return_next_entry(entry, entryLastname);
+
+        OSyncXMLField *xmlfield = osync_xmlfield_new(xmlformat, "Name", error);
+        if (!xmlfield)
+                return FALSE;
+
+        //First Name
+        if (tmp_first) {
+                osync_xmlfield_set_key_value(xmlfield, "FirstName", tmp_first);
+                g_free(tmp_first);
+        }
+
+        //Last Name
+        if (tmp_last) {
+                osync_xmlfield_set_key_value(xmlfield, "LastName", tmp_last);
+                g_free(tmp_last);
+        }
+
+        return TRUE;
+}
+
+static osync_bool _palmcontact_organization(OSyncXMLFormat *xmlformat, PSyncContactEntry *entry, OSyncError **error)
+{
+        char *tmp = return_next_entry(entry, entryCompany);
+
+        // Empty?
+        if (!tmp)
+                return TRUE;
+
+        OSyncXMLField *xmlfield = osync_xmlfield_new(xmlformat, "Organization", error);
+        if (!xmlfield)
+                return FALSE;
+
+        osync_xmlfield_set_key_value(xmlfield, "Name", tmp);
+        g_free(tmp);
+
+        return TRUE;
+}
+
+static osync_bool _palmcontact_telephone(OSyncXMLFormat *xmlformat, PSyncContactEntry *entry, OSyncError **error)
+{
+        int i;
+        char *tmp = NULL;
+        OSyncXMLField *xmlfield = NULL;
+        for (i = entryPhone1; i <= entryPhone5; i++) {
+                tmp = return_next_entry(entry, i);
+                if (!tmp)
+                        continue;
+
+                osync_trace(TRACE_SENSITIVE, "phone #%i: [%i][telephone type /email == 4]", i, entry->address.phoneLabel[i - 3]);
+
+                xmlfield = NULL;
+
+                if (entry->address.phoneLabel[i - 3] == 4)
+                        xmlfield = osync_xmlfield_new(xmlformat, "EMail", error);
+                else
+                        xmlfield = osync_xmlfield_new(xmlformat, "Telephone", error);
+
+                if (!xmlfield)
+                        return FALSE;
+                
+                osync_xmlfield_set_key_value(xmlfield, "Content", tmp);
+                g_free(tmp);
+                
+                switch (entry->address.phoneLabel[i - 3]) {
+                        case 0:
+                                // Work
+                                osync_xmlfield_set_attr(xmlfield, "Location", "Work");
+                                break;
+                        case 1:
+                                // Home
+                                osync_xmlfield_set_attr(xmlfield, "Location", "Home");
+                                break;
+                        case 2:
+                                // Fax
+                                osync_xmlfield_set_attr(xmlfield, "Type", "Fax");
+                                break;
+                        case 3:
+                                // Other FIXME Voice!=Other .. Other is not part of xmlformat-contact xsd
+                                osync_xmlfield_set_attr(xmlfield, "Type", "Voice");
+                                break;
+                        case 4:
+                                // E Mail
+                                break;  
+                        case 5:
+                                // Main FIXME Mail != Prefered !?
+                                osync_xmlfield_set_attr(xmlfield, "Preferred", "true");
+                                break;
+                        case 6:
+                                // Pager
+                                osync_xmlfield_set_attr(xmlfield, "Type", "Pager");
+                                break;
+                        case 7:
+                                // Mobile / Cellular
+                                osync_xmlfield_set_attr(xmlfield, "Type", "Cellular");
+                                break;
+                }
+                
+        }
+        return TRUE;
+}
+
+//Title
+static osync_bool _palmcontact_title(OSyncXMLFormat *xmlformat, PSyncContactEntry *entry, OSyncError **error)
+{
+        char *tmp = return_next_entry(entry, entryTitle);
+        if (!tmp)
+                return TRUE;
+
+        OSyncXMLField *xmlfield = osync_xmlfield_new(xmlformat, "Title", error);
+        if (!xmlfield)
+                return FALSE;
+
+        osync_xmlfield_set_key_value(xmlfield, "Content", tmp);
+        g_free(tmp);
+
+        return TRUE;
+}
+                
+
+//Note
+static osync_bool _palmcontact_note(OSyncXMLFormat *xmlformat, PSyncContactEntry *entry, OSyncError **error)
+{
+        char *tmp = return_next_entry(entry, entryNote);
+        if (!tmp)
+                return TRUE;
+
+
+        OSyncXMLField *xmlfield = osync_xmlfield_new(xmlformat, "Note", error);
+        if (!xmlfield)
+                return FALSE;
+
+        osync_xmlfield_set_key_value(xmlfield, "Content", tmp);
+        g_free(tmp);
+
+        return TRUE;
+}
+
+// Categories
+static osync_bool _palmcontact_categories(OSyncXMLFormat *xmlformat, PSyncContactEntry *entry, OSyncError **error)
+{
+        GList *c = NULL;
+        OSyncXMLField *xmlfield = NULL;
+
+        for (c = entry->categories; c; c = c->next) {
+                if (!xmlfield)
+                        xmlfield = osync_xmlfield_new(xmlformat, "Categories", error);
+
+                if (!xmlfield)
+                        return FALSE;
+
+                char *tmp = conv_enc_palm_to_xml((char *) c->data);
+                osync_xmlfield_set_key_value(xmlfield, "Category", tmp);
+                g_free(tmp);
+        }
+
+        return TRUE;
+}
+
-static osync_bool conv_palm_contact_to_xml(char *input, unsigned int inpsize, char **output, unsigned int *outpsize, osync_bool *free_input, const char *config, OSyncError **error)
-{
@@ -1423 +1639 @@
-        OSyncXMLField *xmlfield = NULL;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        *free_input = TRUE;
-        *output = (char *)xmlformat;