Changeset 2318

Timestamp:

07/12/07 08:07:53 (1 year ago)

Author:

abaumann

Message:

tweaks to XML parsing/generation to avoid conflicts:

• generate name nodes in LastName?, FirstName? order to match vformat converters
  
• process both Location and Type attributes of Telephone nodes for
  determining contact type, and do so case-insensitively
  

Files:

• plugins/moto-sync/motosync.py (modified) (6 diffs)

plugins/moto-sync/motosync.py

@@ -105 +105 @@
-# reverse of the above (almost): mapping from vcard to phone's contact type
-VCARD_CONTACT_TYPES = {
-W
-H
-V
-C
-C
-M
-F
-P
+w
+h
+v
+c
+c
+m
+f
+p
-}
-
@@ -118 +118 @@
-# can also have dom/intl/postal/parcel... these don't really make sense here
-VCARD_ADDRESS_TYPES = {
-W
-H
+w
+h
-}
-
@@ -1713 +1713 @@
-            last = self.name[self.firstlast_index:].strip()
-            if self.firstlast_enabled:
+                appendXMLTag(doc, e, 'LastName', first)
-                appendXMLTag(doc, e, 'FirstName', last)
-                appendXMLTag(doc, e, 'LastName', first)
-            else:
+                appendXMLTag(doc, e, 'LastName', last)
-                appendXMLTag(doc, e, 'FirstName', first)
-                appendXMLTag(doc, e, 'LastName', last)
-        top.appendChild(e)
-
@@ -1821 +1821 @@
-                # filter out any illegal characters from the phone number
-                content = filter(lambda c: c in TEL_NUM_DIGITS, content)
-
+
+
-                is_pref = elt.hasAttribute('Preferred') and elt.getAttribute('Preferred') in ['1', 'true']
-                moto_type = MOTO_CONTACT_DEFAULT
-                for t in ical_types:
+                    t = t.lower()
-                    if VCARD_CONTACT_TYPES.has_key(t):
-                        moto_type = VCARD_CONTACT_TYPES[t]
@@ -1854 +1856 @@
-            ical_types = adr.getAttribute('Location').split(';')
-            for t in ical_types:
+                t = t.lower()
-                if VCARD_ADDRESS_TYPES.has_key(t):
-                    moto_type = VCARD_ADDRESS_TYPES[t]
@@ -1964 +1967 @@
-        else:
-            e = doc.createElement('Telephone')
-
+
+
+
-                e.setAttribute('Type', MOTO_PHONE_CONTACT_TYPES[self.contacttype])
-            elif MOTO_PHONE_CONTACT_LOCATIONS.has_key(self.contacttype):
-                e.setAttribute('Location', MOTO_PHONE_CONTACT_LOCATIONS[self.contacttype])
-            if self.primaryflag:
-                e.setAttribute('Preferred', 'true')